Skip to content

Commit 760d9c9

Browse files
author
lamai93
committed
Go 1.12 for arangosync tests.
1 parent 03cf8a2 commit 760d9c9

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

Makefile

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -262,20 +262,9 @@ endif
262262
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)" '$(ENTERPRISELICENSE)'
263263
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ARANGODIMAGE)" '$(ENTERPRISEIMAGE)' $(TESTTIMEOUT) $(TESTLENGTHOPTIONS) $(TESTOPTIONS)
264264

265-
$(DURATIONTESTBIN): $(GOBUILDDIR) $(SOURCES)
266-
@mkdir -p $(BINDIR)
267-
docker run \
268-
--rm \
269-
-v $(SRCDIR):/usr/code \
270-
-v $(CACHEVOL):/usr/gocache \
271-
-e GOCACHE=/usr/gocache \
272-
-e GOPATH=/usr/code/.gobuild \
273-
-e GOOS=linux \
274-
-e GOARCH=amd64 \
275-
-e CGO_ENABLED=0 \
276-
-w /usr/code/ \
277-
golang:$(GOVERSION) \
278-
go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o /usr/code/bin/$(DURATIONTESTBINNAME) $(REPOPATH)/tests/duration
265+
$(DURATIONTESTBIN): $(SOURCES)
266+
CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(DURATIONTESTBINNAME) $(REPOPATH)/tests/duration
267+
279268

280269
.PHONY: docker-duration-test
281270
docker-duration-test: $(DURATIONTESTBIN)
@@ -374,18 +363,7 @@ redeploy-operator: delete-operator manifests
374363

375364
$(ARANGOSYNCTESTCTRLBIN): $(GOBUILDDIR) $(SOURCES)
376365
@mkdir -p $(BINDIR)
377-
docker run \
378-
--rm \
379-
-v $(SRCDIR):/usr/code \
380-
-v $(CACHEVOL):/usr/gocache \
381-
-e GOCACHE=/usr/gocache \
382-
-e GOPATH=/usr/code/.gobuild \
383-
-e GOOS=linux \
384-
-e GOARCH=amd64 \
385-
-e CGO_ENABLED=0 \
386-
-w /usr/code/ \
387-
golang:$(GOVERSION) \
388-
go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o /usr/code/bin/$(ARANGOSYNCTESTCTRLBINNAME) $(REPOPATH)/tests/sync
366+
CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(ARANGOSYNCTESTCTRLBINNAME) $(REPOPATH)/tests/sync
389367

390368
.PHONY: check-sync-vars
391369
check-sync-vars:

0 commit comments

Comments
 (0)