@@ -24,10 +24,6 @@ GOPATH := $(GOBUILDDIR)
24
24
PULSAR := $(GOBUILDDIR ) /bin/pulsar$(shell go env GOEXE)
25
25
GOASSETSBUILDER := $(GOBUILDDIR ) /bin/go-assets-builder$(shell go env GOEXE)
26
26
27
- DOCKERFILE := Dockerfile
28
- DOCKERTESTFILE := Dockerfile.test
29
- DOCKERDURATIONTESTFILE := tests/duration/Dockerfile
30
-
31
27
HELM ?= $(shell which helm)
32
28
33
29
.PHONY : helm
@@ -96,8 +92,6 @@ ifndef ALLOWCHAOS
96
92
ALLOWCHAOS := true
97
93
endif
98
94
99
- TESTBINNAME := $(PROJECT ) _test
100
- TESTBIN := $(BINDIR ) /$(TESTBINNAME )
101
95
DURATIONTESTBINNAME := $(PROJECT ) _duration_test
102
96
DURATIONTESTBIN := $(BINDIR ) /$(DURATIONTESTBINNAME )
103
97
RELEASE := $(GOBUILDDIR ) /bin/release
@@ -204,7 +198,7 @@ dashboard/assets.go: $(DASHBOARDSOURCES) $(DASHBOARDDIR)/Dockerfile.build
204
198
205
199
.PHONY : docker
206
200
docker : check-vars $(SOURCES ) dashboard/assets.go VERSION
207
- docker build --build-arg VERSION=$(VERSION ) --build-arg COMMIT=$(COMMIT ) -f $( DOCKERFILE ) -t $(OPERATORIMAGE ) .
201
+ docker build --build-arg VERSION=$(VERSION ) --build-arg COMMIT=$(COMMIT ) -f Dockerfile -t $(OPERATORIMAGE ) .
208
202
ifdef PUSHIMAGES
209
203
docker push $(OPERATORIMAGE)
210
204
endif
@@ -297,14 +291,10 @@ else
297
291
docker build -f Dockerfile.unittest .
298
292
endif
299
293
300
- $(TESTBIN ) : $(GOBUILDDIR ) $(SOURCES )
301
- @mkdir -p $(BINDIR )
302
- CGO_ENABLED=0 go test -c -installsuffix netgo -ldflags " -X main.projectVersion=$( VERSION) -X main.projectBuild=$( COMMIT) " -o $(TESTBIN ) $(REPOPATH ) /tests
303
-
304
294
305
295
.PHONY : docker-test
306
- docker-test : $( TESTBIN )
307
- docker build --quiet -f $( DOCKERTESTFILE ) -t $(TESTIMAGE ) .
296
+ docker-test : check-vars $( GOBUILDDIR ) $( SOURCES )
297
+ docker build --quiet -f tests/Dockerfile -t $(TESTIMAGE ) .
308
298
309
299
.PHONY : run-upgrade-tests
310
300
run-upgrade-tests :
@@ -356,7 +346,7 @@ $(DURATIONTESTBIN): $(SOURCES)
356
346
357
347
.PHONY : docker-duration-test
358
348
docker-duration-test : $(DURATIONTESTBIN )
359
- docker build --quiet -f $( DOCKERDURATIONTESTFILE ) -t $(DURATIONTESTIMAGE ) .
349
+ docker build --quiet -f tests/duration/Dockerfile -t $(DURATIONTESTIMAGE ) .
360
350
ifdef PUSHIMAGES
361
351
docker push $(DURATIONTESTIMAGE)
362
352
endif
0 commit comments