@@ -14,7 +14,6 @@ PKG := $(ORG)/operator-lifecycle-manager
14
14
MOD_FLAGS := -mod=vendor -buildvcs=false
15
15
BUILD_TAGS := "json1"
16
16
CMDS := $(shell go list $(MOD_FLAGS ) ./cmd/...)
17
- TCMDS := $(shell go list $(MOD_FLAGS ) ./test/e2e/...)
18
17
MOCKGEN := ./scripts/update_mockgen.sh
19
18
CODEGEN := ./scripts/update_codegen.sh
20
19
IMAGE_REPO := quay.io/operator-framework/olm
@@ -76,11 +75,6 @@ coverage-html: cover.out
76
75
build : build_cmd=build
77
76
build : clean $(CMDS )
78
77
79
- test-bare : BUILD_TAGS=-tags=bare
80
- test-bare : clean $(TCMDS )
81
-
82
- test-bin : clean $(TCMDS )
83
-
84
78
# build versions of the binaries with coverage enabled
85
79
build-coverage : build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/...
86
80
build-coverage : clean $(CMDS )
@@ -111,9 +105,6 @@ $(CMDS):
111
105
112
106
build : clean $(CMDS )
113
107
114
- $(TCMDS ) :
115
- go test -c $(BUILD_TAGS ) $(MOD_FLAGS ) -o bin/$(shell basename $@ ) $@
116
-
117
108
deploy-local :
118
109
mkdir -p build/resources
119
110
. ./scripts/package_release.sh 1.0.0 build/resources doc/install/local-values.yaml
@@ -123,12 +114,6 @@ deploy-local:
123
114
e2e.namespace :
124
115
@printf " e2e-tests-$( shell date +%s) -$$ RANDOM" > e2e.namespace
125
116
126
- # useful if running e2e directly with `go test -tags=bare`
127
- setup-bare : clean e2e.namespace
128
- . ./scripts/build_bare.sh
129
- . ./scripts/package_release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
130
- . ./scripts/install_bare.sh $(shell cat ./e2e.namespace) test/e2e/resources
131
-
132
117
E2E_NODES ?= 1
133
118
E2E_FLAKE_ATTEMPTS ?= 1
134
119
E2E_TIMEOUT ?= 90m
@@ -173,9 +158,6 @@ test/e2e-local.image.tar: e2e.Dockerfile bin/wait bin/cpb $(CMDS)
173
158
docker build -t quay.io/operator-framework/olm:local -f $< bin
174
159
docker save -o $@ quay.io/operator-framework/olm:local
175
160
176
- e2e-bare : setup-bare
177
- . ./scripts/run_e2e_bare.sh $(TEST )
178
-
179
161
e2e-local-docker :
180
162
. ./scripts/build_local.sh
181
163
. ./scripts/run_e2e_docker.sh $(TEST )
0 commit comments