Disable ScyllaDBMonitoring tests in OpenShift E2E

This is because our current implementation of ScyllaDBMonitoring creates a Prometheus stack that interferes with OpenShift's Prometheus pattern. This problem is described in #2319. Therefore, we do not expect ScyllaDBMonitoring in its current form to be usable on OpenShift. Instead, we intend to implement one of the solutions listed in a comment to the linked issue. Until then, we consider monitoring incompatible with OpenShift.
scylladb · Feb 19, 2025 · ef14c97 · ef14c97
1 parent a6e6bbf
commit ef14c97
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/hack/.ci/lib/e2e.sh b/hack/.ci/lib/e2e.sh
@@ -203,6 +203,7 @@ function run-e2e {
     exit 2
   fi
 
+  SO_SKIPPED_TESTS="${SO_SKIPPED_TESTS:-}"
   FIELD_MANAGER="${FIELD_MANAGER:-run-e2e-script}"
   SO_BUCKET_NAME="${SO_BUCKET_NAME:-}"
   SO_E2E_PARALLELISM="${SO_E2E_PARALLELISM:-0}"
@@ -265,6 +266,7 @@ spec:
     - scylla-operator-tests
     - run
     - "${SO_SUITE}"
+    - "--skip=${SO_SKIPPED_TESTS}"
     - "--kubeconfig=${kubeconfigs_in_container_path}"
     - --loglevel=2
     - --color=false

diff --git a/hack/.ci/run-e2e-openshift-aws-release.sh b/hack/.ci/run-e2e-openshift-aws-release.sh
@@ -23,6 +23,13 @@ trap gather-artifacts-on-exit EXIT
 REENTRANT="${REENTRANT=false}"
 export REENTRANT
 
+# Test cases including $test_disable_tag in their name will be skipped.
+# TODO: Get rid of this tagging method in favor of defined test suites, and mapping
+# specific test suites to specific runtime configurations.
+test_disable_tag="TESTCASE_DISABLED_ON_OPENSHIFT"
+SO_SKIPPED_TESTS="${SO_SKIPPED_TESTS:-$test_disable_tag}"
+export SO_SKIPPED_TESTS
+
 SO_NODECONFIG_PATH="${SO_NODECONFIG_PATH=${parent_dir}/manifests/cluster/nodeconfig-openshift-aws.yaml}"
 export SO_NODECONFIG_PATH
 

diff --git a/hack/.ci/run-e2e-openshift-aws.sh b/hack/.ci/run-e2e-openshift-aws.sh
@@ -23,10 +23,19 @@ trap gather-artifacts-on-exit EXIT
 REENTRANT="${REENTRANT=false}"
 export REENTRANT
 
+# Test cases including $test_disable_tag in their name will be skipped.
+# TODO: Get rid of this tagging method in favor of defined test suites, and mapping
+# specific test suites to specific runtime configurations.
+test_disable_tag="TESTCASE_DISABLED_ON_OPENSHIFT"
+SO_SKIPPED_TESTS="${SO_SKIPPED_TESTS:-$test_disable_tag}"
+export SO_SKIPPED_TESTS
+
 SO_NODECONFIG_PATH="${SO_NODECONFIG_PATH=${parent_dir}/manifests/cluster/nodeconfig-openshift-aws.yaml}"
 export SO_NODECONFIG_PATH
+
 SO_CSI_DRIVER_PATH="${SO_CSI_DRIVER_PATH=${parent_dir}/manifests/namespaces/local-csi-driver/}"
 export SO_CSI_DRIVER_PATH
+
 SO_SCYLLACLUSTER_STORAGECLASS_NAME="${SO_SCYLLACLUSTER_STORAGECLASS_NAME=scylladb-local-xfs}"
 export SO_SCYLLACLUSTER_STORAGECLASS_NAME
 

diff --git a/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go b/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go
@@ -132,7 +132,8 @@ var _ = g.Describe("ScyllaDBMonitoring", func() {
 		return fmt.Sprintf("with %q monitoring type", e.Type)
 	}
 
-	g.DescribeTable("should setup monitoring stack", func(e *entry) {
+	// Disabled on OpenShift because of https://github.com/scylladb/scylla-operator/issues/2319#issuecomment-2643287819
+	g.DescribeTable("should setup monitoring stack TESTCASE_DISABLED_ON_OPENSHIFT", func(e *entry) {
 		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
 		defer cancel()