From 250e251a00f5b4a8bc65ab9d0b1caf15042cb744 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 11 May 2026 14:13:43 -0400 Subject: [PATCH 1/2] UPSTREAM: : Fix flags passed to test-experimental-e2e Signed-off-by: Todd Short --- openshift/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/openshift/Makefile b/openshift/Makefile index 12f2400be..122c4e56e 100644 --- a/openshift/Makefile +++ b/openshift/Makefile @@ -36,19 +36,21 @@ E2E_REGISTRY_NAMESPACE=operator-controller-e2e export CLUSTER_REGISTRY_HOST := $(E2E_REGISTRY_NAME).$(E2E_REGISTRY_NAMESPACE).svc:5000 export DOWNSTREAM_E2E_FLAGS := -count=1 -v -export DOWNSTREAM_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile +export DOWNSTREAM_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile && ~@CatalogdHA +#default timeout is 10m, but with an unknown set of feature gates enabled, we need to bump this up +export DOWNSTREAM_E2E_TIMEOUT := 50m .PHONY: test-e2e test-e2e: ## Run the e2e tests. $(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) cd $(DIR)/../; \ - go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go --godog.tags="$(DOWNSTREAM_GODOG_FLAGS)" --k8s.cli=oc + go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go \ + -timeout=$(DOWNSTREAM_E2E_TIMEOUT) \ + --godog.tags="$(DOWNSTREAM_GODOG_FLAGS)" \ + --k8s.cli=oc -export DOWNSTREAM_EXPERIMENTAL_E2E_FLAGS := -count=1 -v .PHONY: test-experimental-e2e test-experimental-e2e: ## Run the experimental e2e tests. - $(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) - cd $(DIR)/../; \ - go test $(DOWNSTREAM_EXPERIMENTAL_E2E_FLAGS) ./test/experimental-e2e/...; + /bin/true # keep - because it's triggered, but always succeed PHONY: go-build-local go-build-local: From c938bcf1cfd832272173bb8c56b91186bd45bcc7 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 12 May 2026 19:36:04 -0400 Subject: [PATCH 2/2] fixup! UPSTREAM: : Fix flags passed to test-experimental-e2e --- openshift/Makefile | 3 +++ test/e2e/steps/steps.go | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/openshift/Makefile b/openshift/Makefile index 122c4e56e..f5e963cb5 100644 --- a/openshift/Makefile +++ b/openshift/Makefile @@ -39,6 +39,9 @@ export DOWNSTREAM_E2E_FLAGS := -count=1 -v export DOWNSTREAM_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile && ~@CatalogdHA #default timeout is 10m, but with an unknown set of feature gates enabled, we need to bump this up export DOWNSTREAM_E2E_TIMEOUT := 50m +# BoxcutterRuntime (techpreview) applies resources sequentially through phases +# (CRD must be Established before the deploy phase) so installations take longer. +export E2E_STEP_TIMEOUT := 10m .PHONY: test-e2e test-e2e: ## Run the e2e tests. $(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) diff --git a/test/e2e/steps/steps.go b/test/e2e/steps/steps.go index a0892f4bd..a318c4296 100644 --- a/test/e2e/steps/steps.go +++ b/test/e2e/steps/steps.go @@ -52,10 +52,22 @@ import ( const ( olmDeploymentName = "operator-controller-controller-manager" catalogdDeploymentName = "catalogd-controller-manager" - timeout = 5 * time.Minute + defaultTimeout = 5 * time.Minute tick = 1 * time.Second ) +// timeout is the per-step wait timeout. It defaults to defaultTimeout (5m) but +// can be overridden via E2E_STEP_TIMEOUT to accommodate runtimes (e.g. +// BoxcutterRuntime) that take longer to complete an installation. +var timeout = func() time.Duration { + if s := os.Getenv("E2E_STEP_TIMEOUT"); s != "" { + if d, err := time.ParseDuration(s); err == nil { + return d + } + } + return defaultTimeout +}() + var ( olmNamespace = "olmv1-system" componentNamespaces = map[string]string{} // keyed by component label (e.g. "catalogd"); falls back to olmNamespace