From 718a4679c323947c6a6d83eba46a44ed9b0545a8 Mon Sep 17 00:00:00 2001
From: Alexander Greene <greene.al1991@gmail.com>
Date: Sat, 12 Nov 2022 08:11:39 -0800
Subject: [PATCH] Revert "Allow E2E to skip multiple tests (#2892)"

This reverts commit 6cfd86cfd5c91c6b5232fb99a623c1fa5d63edbc, which is
not necessary because the ginkgo run --skip flag supports regex.

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
---
 Makefile                      |  5 +----
 scripts/split_skips_string.sh | 14 --------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100755 scripts/split_skips_string.sh

diff --git a/Makefile b/Makefile
index 5bd569d867..ae104d6de2 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@ IMAGE_REPO := quay.io/operator-framework/olm
 IMAGE_TAG ?= "dev"
 SPECIFIC_UNIT_TEST := $(if $(TEST),-run $(TEST),)
 LOCAL_NAMESPACE := "olm"
-SPLIT_SKIP=$(shell ./scripts/split_skips_string.sh "$(SKIP)")
 export GO111MODULE=on
 YQ_INTERNAL := go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v3/
 KUBEBUILDER_ASSETS := $(or $(or $(KUBEBUILDER_ASSETS),$(dir $(shell command -v kubebuilder))),/usr/local/kubebuilder/bin)
@@ -137,9 +136,7 @@ E2E_TEST_NUM_CHUNKS ?= 4
 ifneq (all,$(E2E_TEST_CHUNK))
 TEST := $(shell go run ./test/e2e/split/... -chunks $(E2E_TEST_NUM_CHUNKS) -print-chunk $(E2E_TEST_CHUNK) ./test/e2e)
 endif
-
-
-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
+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
 E2E_INSTALL_NS ?= operator-lifecycle-manager
 E2E_CATALOG_NS ?= $(E2E_INSTALL_NS)
 E2E_TEST_NS ?= operators
diff --git a/scripts/split_skips_string.sh b/scripts/split_skips_string.sh
deleted file mode 100755
index cd4648e609..0000000000
--- a/scripts/split_skips_string.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Set the delimiter
-IFS=';'
-
-# Read the split words into an array
-read -ra skipped_tests <<< "$1"
-
-# Construct the skip arguments for the e2e test
-output=""
-for test in "${skipped_tests[@]}";
-do
- output="$output -skip '$test'"
-done
-
-echo $output