for debugging purpose

rh-pre-commit.version: 2.1.0 rh-pre-commit.check-secrets: ENABLED
openshift-pipelines · Jul 18, 2024 · 9fcc73d · 9fcc73d
1 parent c0f1f90
commit 9fcc73d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.tekton/pipeline/test-pipeline-service-deployment.yaml b/.tekton/pipeline/test-pipeline-service-deployment.yaml
@@ -89,9 +89,9 @@ spec:
       taskRef:
         name: destroy-cluster
       when:
-        - input: "$(tasks.deploy-cluster.status)"
-          operator: notin
-          values: ["None", "Failed"]
+        - input: "$(tasks.test-pipeline-service.status)"
+          operator: in
+          values: ["Succeeded"]
       params:
         - name: cluster-name
           value: "$(tasks.generate-cluster-name.results.cluster-name)"

diff --git a/.tekton/pipeline/test-pipeline-service-upgrade.yaml b/.tekton/pipeline/test-pipeline-service-upgrade.yaml
@@ -147,9 +147,9 @@ spec:
       taskRef:
         name: destroy-cluster
       when:
-        - input: "$(tasks.deploy-cluster.status)"
-          operator: notin
-          values: ["None", "Failed"]
+        - input: "$(tasks.test-baseline.status)"
+          operator: in
+          values: ["Succeeded"]
       params:
         - name: cluster-name
           value: "$(tasks.generate-cluster-name.results.cluster-name)"

diff --git a/operator/test/test.sh b/operator/test/test.sh
@@ -81,7 +81,10 @@ init() {
 setup_test() {
   echo "[Setup]"
   echo -n "  - Namespace configuration: "
-  kubectl apply -k "$SCRIPT_DIR/manifests/setup/pipeline-service" >"$DEBUG_OUTPUT"
+  if ! timeout 300s bash -c "while ! kubectl apply -k \"$SCRIPT_DIR/manifests/setup/pipeline-service\" >\"$DEBUG_OUTPUT\" 2>&1; do printf '.'; sleep 3; done"; then
+      echo "Setup test is not ready" >&2
+      exit 1
+  fi
   echo "OK"
   echo
 }