Skip to content

OPRUN-4607: Fix flags passed to test-experimental-e2e #723

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.

Sign up for GitHub

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

Open
tmshort wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −6
Open

OPRUN-4607: Fix flags passed to test-experimental-e2e #723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions openshift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
coderabbitai[bot] marked this conversation as resolved.

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
Comment thread
coderabbitai[bot] marked this conversation as resolved.

PHONY: go-build-local
go-build-local:
Expand Down