From d1f56598f9b1ffebe4bc2dd6f4ed4c9772cc503c Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 18 May 2026 14:28:56 -0400 Subject: [PATCH] UPSTREAM: : Fix downstream e2e test invocation - Replace broken test-experimental-e2e target (test/experimental-e2e no longer exists) with /bin/true so triggered jobs always succeed - Pass -timeout=60m to go test; the previous invocation relied on Go's 10m default which is too short for BoxcutterRuntime clusters - Set E2E_STEP_TIMEOUT=15m; BoxcutterRuntime applies resources through sequential phases (CRD must reach Established before the deploy phase starts), making installations slower than the upstream 5m default - Skip ~@CatalogdHA scenarios (require multiple catalogd replicas not present in standard topology) - Skip ~@ProgressDeadline scenarios (require progressDeadlineMinutes < 10 but the OpenShift CRD enforces a minimum of 10) - Skip ~@HTTPProxy scenarios (too disruptive to cluster networking) Co-Authored-By: Claude Sonnet 4.6 Signed-off-by: Todd Short --- openshift/Makefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/openshift/Makefile b/openshift/Makefile index 12f2400be..0ae31823e 100644 --- a/openshift/Makefile +++ b/openshift/Makefile @@ -36,19 +36,24 @@ 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 && ~@ProgressDeadline && ~@HTTPProxy +export DOWNSTREAM_E2E_TIMEOUT := 60m +# BoxcutterRuntime (techpreview) applies resources sequentially through phases +# (CRD must be Established before the deploy phase) so installations take longer +# than the upstream 5m default. +export E2E_STEP_TIMEOUT := 15m .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: