From e76f9dbcd9e39bb7a3bfeac47208cb8d5d59f197 Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Wed, 26 Jun 2024 18:44:00 +0200 Subject: [PATCH 1/3] make flake attempts an optional parameter (#3330) Signed-off-by: Per Goncalves da Silva Co-authored-by: Per Goncalves da Silva Upstream-repository: operator-lifecycle-manager Upstream-commit: 5d32045dbe4f65526264f6115bff748d340a7cab --- staging/operator-lifecycle-manager/Makefile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/staging/operator-lifecycle-manager/Makefile b/staging/operator-lifecycle-manager/Makefile index c5c32cf49d..ecd52a045b 100644 --- a/staging/operator-lifecycle-manager/Makefile +++ b/staging/operator-lifecycle-manager/Makefile @@ -136,21 +136,12 @@ E2E_TIMEOUT ?= 90m E2E_TEST_NS ?= operators E2E_INSTALL_NS ?= operator-lifecycle-manager E2E_CATALOG_NS ?= $(E2E_INSTALL_NS) -E2E_FLAKE_ATTEMPTS ?= 1 -GINKGO_OPTS += -v -randomize-suites -race -trace --show-node-events --flake-attempts=$(E2E_FLAKE_ATTEMPTS) $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(TEST),-focus '$(TEST)',) $(if $(SKIP), -skip '$(SKIP)') +GINKGO_OPTS += -v -randomize-suites -race -trace --show-node-events $(if $(E2E_FLAKE_ATTEMPTS),--flake-attempts='$(E2E_FLAKE_ATTEMPTS)') $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(TEST),-focus '$(TEST)',) $(if $(SKIP), -skip '$(SKIP)') e2e: $(GINKGO) -timeout $(E2E_TIMEOUT) $(GINKGO_OPTS) ./test/e2e -- -namespace=$(E2E_TEST_NS) -olmNamespace=$(E2E_INSTALL_NS) -catalogNamespace=$(E2E_CATALOG_NS) $(E2E_OPTS) .PHONY: e2e-local -e2e-local: e2e-build kind-create deploy e2e - -# See workflows/e2e-tests.yml See test/e2e/README.md for details. -.PHONY: e2e-local -e2e-local: BUILD_TAGS="json1 e2e experimental_metrics" -e2e-local: extra_args=-kind.images=../test/e2e-local.image.tar -test-data-dir=../test/e2e/testdata -gather-artifacts-script-path=../test/e2e/collect-ci-artifacts.sh -e2e-local: run=bin/e2e-local.test -e2e-local: bin/e2e-local.test test/e2e-local.image.tar -e2e-local: e2e +e2e-local: e2e-build deploy e2e # this target updates the zz_chart.go file with files found in deploy/chart # this will always fire since it has been marked as phony @@ -183,9 +174,6 @@ e2e-build: 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) - e2e-local-docker: . ./scripts/build_local.sh . ./scripts/run_e2e_docker.sh $(TEST) From c93697da8a5f44bd3faca894b1ee813bc8a71a54 Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Wed, 26 Jun 2024 19:48:08 +0200 Subject: [PATCH 2/3] drop --show-node-events from e2e call (#3331) Signed-off-by: Per Goncalves da Silva Co-authored-by: Per Goncalves da Silva Upstream-repository: operator-lifecycle-manager Upstream-commit: 75c3f583056548eae4c39c4e918789d6a9ced70b --- staging/operator-lifecycle-manager/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/operator-lifecycle-manager/Makefile b/staging/operator-lifecycle-manager/Makefile index ecd52a045b..9c08477b15 100644 --- a/staging/operator-lifecycle-manager/Makefile +++ b/staging/operator-lifecycle-manager/Makefile @@ -136,7 +136,7 @@ E2E_TIMEOUT ?= 90m E2E_TEST_NS ?= operators E2E_INSTALL_NS ?= operator-lifecycle-manager E2E_CATALOG_NS ?= $(E2E_INSTALL_NS) -GINKGO_OPTS += -v -randomize-suites -race -trace --show-node-events $(if $(E2E_FLAKE_ATTEMPTS),--flake-attempts='$(E2E_FLAKE_ATTEMPTS)') $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(TEST),-focus '$(TEST)',) $(if $(SKIP), -skip '$(SKIP)') +GINKGO_OPTS += -v -randomize-suites -race -trace $(if $(E2E_FLAKE_ATTEMPTS),--flake-attempts='$(E2E_FLAKE_ATTEMPTS)') $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(TEST),-focus '$(TEST)',) $(if $(SKIP), -skip '$(SKIP)') e2e: $(GINKGO) -timeout $(E2E_TIMEOUT) $(GINKGO_OPTS) ./test/e2e -- -namespace=$(E2E_TEST_NS) -olmNamespace=$(E2E_INSTALL_NS) -catalogNamespace=$(E2E_CATALOG_NS) $(E2E_OPTS) From 77f8fa9914536dda663f34b8b7dfb90a890a5d2c Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Mon, 1 Jul 2024 18:00:12 +0200 Subject: [PATCH 3/3] bump e2e timeout by 15 mins Signed-off-by: Per Goncalves da Silva --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fdc20e66d3..36d0754035 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ e2e/operator-registry: ## Run e2e registry tests $(MAKE) e2e WHAT=operator-registry e2e/olm: ## Run e2e olm tests - $(MAKE) e2e WHAT=operator-lifecycle-manager E2E_FLAKE_ATTEMPTS=0 E2E_CATALOG_NS=openshift-marketplace E2E_INSTALL_NS=openshift-operator-lifecycle-manager E2E_TEST_NS=openshift-operators E2E_TIMEOUT=120m KUBECTL=oc E2E_OPTS="-communityOperators=quay.io/olmtest/test-catalog:v1.39.0" + $(MAKE) e2e WHAT=operator-lifecycle-manager E2E_FLAKE_ATTEMPTS=0 E2E_CATALOG_NS=openshift-marketplace E2E_INSTALL_NS=openshift-operator-lifecycle-manager E2E_TEST_NS=openshift-operators E2E_TIMEOUT=135m KUBECTL=oc E2E_OPTS="-communityOperators=quay.io/olmtest/test-catalog:v1.39.0" .PHONY: vendor vendor: