Skip to content

Commit 718a467

Browse files
committed
Revert "Allow E2E to skip multiple tests (#2892)"
This reverts commit 6cfd86c, which is not necessary because the ginkgo run --skip flag supports regex. Signed-off-by: Alexander Greene <[email protected]>
1 parent 6cfd86c commit 718a467

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

Makefile

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ IMAGE_REPO := quay.io/operator-framework/olm
2121
IMAGE_TAG ?= "dev"
2222
SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
2323
LOCAL_NAMESPACE := "olm"
24-
SPLIT_SKIP=$(shell ./scripts/split_skips_string.sh "$(SKIP)")
2524
export GO111MODULE=on
2625
YQ_INTERNAL := go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v3/
2726
KUBEBUILDER_ASSETS := $(or $(or $(KUBEBUILDER_ASSETS),$(dir $(shell command -v kubebuilder))),/usr/local/kubebuilder/bin)
@@ -137,9 +136,7 @@ E2E_TEST_NUM_CHUNKS ?= 4
137136
ifneq (all,$(E2E_TEST_CHUNK))
138137
TEST := $(shell go run ./test/e2e/split/... -chunks $(E2E_TEST_NUM_CHUNKS) -print-chunk $(E2E_TEST_CHUNK) ./test/e2e)
139138
endif
140-
141-
142-
E2E_OPTS ?= $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(SKIP), $(SPLIT_SKIP)) $(if $(TEST),-focus '$(TEST)') $(if $(ARTIFACT_DIR), -output-dir $(ARTIFACT_DIR) -junit-report junit_e2e.xml) -flake-attempts $(E2E_FLAKE_ATTEMPTS) -nodes $(E2E_NODES) -timeout $(E2E_TIMEOUT) -v -randomize-suites -race -trace -progress
139+
E2E_OPTS ?= $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(SKIP), -skip '$(SKIP)') $(if $(TEST),-focus '$(TEST)') $(if $(ARTIFACT_DIR), -output-dir $(ARTIFACT_DIR) -junit-report junit_e2e.xml) -flake-attempts $(E2E_FLAKE_ATTEMPTS) -nodes $(E2E_NODES) -timeout $(E2E_TIMEOUT) -v -randomize-suites -race -trace -progress
143140
E2E_INSTALL_NS ?= operator-lifecycle-manager
144141
E2E_CATALOG_NS ?= $(E2E_INSTALL_NS)
145142
E2E_TEST_NS ?= operators

scripts/split_skips_string.sh

-14
This file was deleted.

0 commit comments

Comments
 (0)