Skip to content

Commit 3669b33

Browse files
perdasilvaPer Goncalves da Silva
and
Per Goncalves da Silva
authoredMay 7, 2024··
remove bare build and e2e modality (#3218)
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]>
1 parent 66f8571 commit 3669b33

File tree

6 files changed

+0
-243
lines changed

6 files changed

+0
-243
lines changed
 

Diff for: ‎Makefile

-18
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ PKG := $(ORG)/operator-lifecycle-manager
1414
MOD_FLAGS := -mod=vendor -buildvcs=false
1515
BUILD_TAGS := "json1"
1616
CMDS := $(shell go list $(MOD_FLAGS) ./cmd/...)
17-
TCMDS := $(shell go list $(MOD_FLAGS) ./test/e2e/...)
1817
MOCKGEN := ./scripts/update_mockgen.sh
1918
CODEGEN := ./scripts/update_codegen.sh
2019
IMAGE_REPO := quay.io/operator-framework/olm
@@ -76,11 +75,6 @@ coverage-html: cover.out
7675
build: build_cmd=build
7776
build: clean $(CMDS)
7877

79-
test-bare: BUILD_TAGS=-tags=bare
80-
test-bare: clean $(TCMDS)
81-
82-
test-bin: clean $(TCMDS)
83-
8478
# build versions of the binaries with coverage enabled
8579
build-coverage: build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/...
8680
build-coverage: clean $(CMDS)
@@ -111,9 +105,6 @@ $(CMDS):
111105

112106
build: clean $(CMDS)
113107

114-
$(TCMDS):
115-
go test -c $(BUILD_TAGS) $(MOD_FLAGS) -o bin/$(shell basename $@) $@
116-
117108
deploy-local:
118109
mkdir -p build/resources
119110
. ./scripts/package_release.sh 1.0.0 build/resources doc/install/local-values.yaml
@@ -123,12 +114,6 @@ deploy-local:
123114
e2e.namespace:
124115
@printf "e2e-tests-$(shell date +%s)-$$RANDOM" > e2e.namespace
125116

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-
132117
E2E_NODES ?= 1
133118
E2E_FLAKE_ATTEMPTS ?= 1
134119
E2E_TIMEOUT ?= 90m
@@ -173,9 +158,6 @@ test/e2e-local.image.tar: e2e.Dockerfile bin/wait bin/cpb $(CMDS)
173158
docker build -t quay.io/operator-framework/olm:local -f $< bin
174159
docker save -o $@ quay.io/operator-framework/olm:local
175160

176-
e2e-bare: setup-bare
177-
. ./scripts/run_e2e_bare.sh $(TEST)
178-
179161
vendor:
180162
go mod tidy
181163
go mod vendor

Diff for: ‎scripts/run_e2e_bare.sh

-17
This file was deleted.

Diff for: ‎test/e2e/catalog_e2e_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build !bare
2-
// +build !bare
3-
41
package e2e
52

63
import (

Diff for: ‎test/e2e/e2e-bare-values.yaml

-40
This file was deleted.

Diff for: ‎test/e2e/metrics_e2e_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build !bare
2-
// +build !bare
3-
41
package e2e
52

63
import (

Diff for: ‎test/e2e/setup_bare_test.go

-162
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.