Skip to content

clean-up: remove 'bare' build and e2e test modality #3218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ PKG := $(ORG)/operator-lifecycle-manager
MOD_FLAGS := -mod=vendor -buildvcs=false
BUILD_TAGS := "json1"
CMDS := $(shell go list $(MOD_FLAGS) ./cmd/...)
TCMDS := $(shell go list $(MOD_FLAGS) ./test/e2e/...)
MOCKGEN := ./scripts/update_mockgen.sh
CODEGEN := ./scripts/update_codegen.sh
IMAGE_REPO := quay.io/operator-framework/olm
Expand Down Expand Up @@ -76,11 +75,6 @@ coverage-html: cover.out
build: build_cmd=build
build: clean $(CMDS)

test-bare: BUILD_TAGS=-tags=bare
test-bare: clean $(TCMDS)

test-bin: clean $(TCMDS)

# build versions of the binaries with coverage enabled
build-coverage: build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/...
build-coverage: clean $(CMDS)
Expand Down Expand Up @@ -111,9 +105,6 @@ $(CMDS):

build: clean $(CMDS)

$(TCMDS):
go test -c $(BUILD_TAGS) $(MOD_FLAGS) -o bin/$(shell basename $@) $@

deploy-local:
mkdir -p build/resources
. ./scripts/package_release.sh 1.0.0 build/resources doc/install/local-values.yaml
Expand All @@ -123,12 +114,6 @@ deploy-local:
e2e.namespace:
@printf "e2e-tests-$(shell date +%s)-$$RANDOM" > e2e.namespace

# useful if running e2e directly with `go test -tags=bare`
setup-bare: clean e2e.namespace
. ./scripts/build_bare.sh
. ./scripts/package_release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
. ./scripts/install_bare.sh $(shell cat ./e2e.namespace) test/e2e/resources

E2E_NODES ?= 1
E2E_FLAKE_ATTEMPTS ?= 1
E2E_TIMEOUT ?= 90m
Expand Down Expand Up @@ -173,9 +158,6 @@ test/e2e-local.image.tar: e2e.Dockerfile bin/wait bin/cpb $(CMDS)
docker build -t quay.io/operator-framework/olm:local -f $< bin
docker save -o $@ quay.io/operator-framework/olm:local

e2e-bare: setup-bare
. ./scripts/run_e2e_bare.sh $(TEST)

vendor:
go mod tidy
go mod vendor
Expand Down
17 changes: 0 additions & 17 deletions scripts/run_e2e_bare.sh

This file was deleted.

3 changes: 0 additions & 3 deletions test/e2e/catalog_e2e_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build !bare
// +build !bare

package e2e

import (
Expand Down
40 changes: 0 additions & 40 deletions test/e2e/e2e-bare-values.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions test/e2e/metrics_e2e_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build !bare
// +build !bare

package e2e

import (
Expand Down
162 changes: 0 additions & 162 deletions test/e2e/setup_bare_test.go

This file was deleted.

Loading