From 6c23cafd1a4180563c2c9e8bc9499f7da86b981c Mon Sep 17 00:00:00 2001
From: Maciej Zimnoch <maciej@scylladb.com>
Date: Fri, 31 Jan 2025 20:00:03 +0100
Subject: [PATCH 1/2] Disable installing prometheus-operator on Openshift

---
 hack/ci-deploy.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hack/ci-deploy.sh b/hack/ci-deploy.sh
index ddcc90ffbb..874a19bbe8 100755
--- a/hack/ci-deploy.sh
+++ b/hack/ci-deploy.sh
@@ -29,7 +29,7 @@ mkdir -p "${DEPLOY_DIR}/"{operator,manager,prometheus-operator,haproxy-ingress}
 
 cp ./deploy/manager/dev/*.yaml "${DEPLOY_DIR}/manager"
 cp ./deploy/operator/*.yaml "${DEPLOY_DIR}/operator"
-cp ./examples/third-party/prometheus-operator/*.yaml "${DEPLOY_DIR}/prometheus-operator"
+# cp ./examples/third-party/prometheus-operator/*.yaml "${DEPLOY_DIR}/prometheus-operator"
 cp ./examples/third-party/haproxy-ingress/*.yaml "${DEPLOY_DIR}/haproxy-ingress"
 cp ./examples/third-party/cert-manager.yaml "${DEPLOY_DIR}/"
 
@@ -76,7 +76,7 @@ if [[ -n ${SCYLLA_OPERATOR_FEATURE_GATES+x} ]]; then
     yq e --inplace '.spec.template.spec.containers[0].args += "--feature-gates="+ env(SCYLLA_OPERATOR_FEATURE_GATES)' "${DEPLOY_DIR}/operator/50_operator.deployment.yaml"
 fi
 
-kubectl_create -n prometheus-operator -f "${DEPLOY_DIR}/prometheus-operator"
+# kubectl_create -n prometheus-operator -f "${DEPLOY_DIR}/prometheus-operator"
 kubectl_create -n haproxy-ingress -f "${DEPLOY_DIR}/haproxy-ingress"
 kubectl_create -f "${DEPLOY_DIR}"/cert-manager.yaml
 
@@ -127,5 +127,5 @@ kubectl -n haproxy-ingress rollout status --timeout=5m deployment.apps/haproxy-i
 kubectl wait --for condition=established crd/nodeconfigs.scylla.scylladb.com
 kubectl wait --for condition=established crd/scyllaoperatorconfigs.scylla.scylladb.com
 kubectl wait --for condition=established crd/scylladbmonitorings.scylla.scylladb.com
-kubectl wait --for condition=established $( find "${DEPLOY_DIR}/prometheus-operator/" -name '*.crd.yaml' -printf '-f=%p\n' )
-kubectl -n=prometheus-operator rollout status deploy/prometheus-operator
+# kubectl wait --for condition=established $( find "${DEPLOY_DIR}/prometheus-operator/" -name '*.crd.yaml' -printf '-f=%p\n' )
+# kubectl -n=prometheus-operator rollout status deploy/prometheus-operator

From 2d1f453786247718316432433d9869ac28cdf172 Mon Sep 17 00:00:00 2001
From: Maciej Zimnoch <maciej@scylladb.com>
Date: Fri, 31 Jan 2025 20:01:43 +0100
Subject: [PATCH 2/2] Speed up

---
 hack/.ci/lib/e2e.sh                                   | 2 +-
 test/e2e/set/scylladbmonitoring/scylladbmonitoring.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hack/.ci/lib/e2e.sh b/hack/.ci/lib/e2e.sh
index 4fdc793db5..6757030818 100755
--- a/hack/.ci/lib/e2e.sh
+++ b/hack/.ci/lib/e2e.sh
@@ -257,7 +257,7 @@ spec:
     command:
     - scylla-operator-tests
     - run
-    - "${SO_SUITE}"
+    - all
     - "--kubeconfig=${kubeconfigs_in_container_path}"
     - --loglevel=2
     - --color=false
diff --git a/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go b/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go
index 8e4ddb0ac0..85c38e2928 100644
--- a/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go
+++ b/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go
@@ -119,7 +119,7 @@ var _ = g.BeforeSuite(func() {
 	expectedPlatformHomeDashboardUID = ghd.UID
 })
 
-var _ = g.Describe("ScyllaDBMonitoring", func() {
+var _ = g.FDescribe("ScyllaDBMonitoring", func() {
 	f := framework.NewFramework("scylladbmonitoring")
 
 	type entry struct {