From 204e899c25a1e80f82efa318d544acdeb40a6706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Hern=C3=A1ndez?=
 <23639005+israel-hdez@users.noreply.github.com>
Date: Wed, 13 Dec 2023 10:56:51 -0600
Subject: [PATCH] Use ThirdParty tokens for CI, for compatibility with
 ROSA-Hosted clusters

Also, remove Mesh-related components that are not needed.
---
 test/scripts/openshift-ci/deploy.ossm.sh      | 31 +++++++++----------
 .../scripts/openshift-ci/deploy.serverless.sh |  2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/test/scripts/openshift-ci/deploy.ossm.sh b/test/scripts/openshift-ci/deploy.ossm.sh
index 2e3876a39ca..c30bd673017 100755
--- a/test/scripts/openshift-ci/deploy.ossm.sh
+++ b/test/scripts/openshift-ci/deploy.ossm.sh
@@ -111,25 +111,24 @@ metadata:
   name: basic
   namespace: istio-system
 spec:
-  version: v2.3
-  tracing:
-    type: Jaeger
-    sampling: 10000
-# Uncomment if on ROSA
-#  security:
-#    identity:
-#      type: ThirdParty
   addons:
-    jaeger:
-      name: jaeger
-      install:
-        storage:
-          type: Memory
+    grafana:
+      enabled: false
     kiali:
-      enabled: true
+      enabled: false
       name: kiali
-    grafana:
-      enabled: true
+    prometheus:
+      enabled: false
+    jaeger:
+      name: jaeger
+  gateways:
+    openshiftRoute:
+      enabled: false
+  security:
+    identity:
+      type: ThirdParty
+  tracing:
+    type: None
 EOF
 
 # Waiting for OSSM minimum start
diff --git a/test/scripts/openshift-ci/deploy.serverless.sh b/test/scripts/openshift-ci/deploy.serverless.sh
index 93e4d1c60a1..a41b51e0b84 100755
--- a/test/scripts/openshift-ci/deploy.serverless.sh
+++ b/test/scripts/openshift-ci/deploy.serverless.sh
@@ -29,7 +29,7 @@ waitpodready() {
   local podlabel=${1?pod label is required}; shift
 
   waitforpodlabeled "$ns" "$podlabel"
-  sleep 10
+  sleep 2
   oc get pod -n $ns -l $podlabel
 
   echo "Waiting for pod -l $podlabel to become ready"