Merge pull request #146 from israel-hdez/ci-rosa-fix

Use ThirdParty tokens for CI, for compatibility with ROSA-Hosted clusters
spolti · Dec 13, 2023 · 7146558 · 7146558
2 parents 0f92f64 + 204e899
commit 7146558
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git 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
@@ -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"