Print debug log for OCP deployment

openshift-pipelines · Aug 17, 2023 · 3012fa0 · 3012fa0
1 parent ce1c9a9
commit 3012fa0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.tekton/pipeline/acceptance-tests.yaml b/.tekton/pipeline/acceptance-tests.yaml
@@ -113,7 +113,7 @@ spec:
       when:
         - input: "$(tasks.deploy-cluster.status)"
           operator: notin
-          values: ["None"]
+          values: ["None", "Failed"]
       params:
         - name: cluster-name
           value: "$(tasks.generate-cluster-name.results.cluster-name)"

diff --git a/.tekton/pipeline/upgrade-tests.yaml b/.tekton/pipeline/upgrade-tests.yaml
@@ -199,7 +199,7 @@ spec:
       when:
         - input: "$(tasks.deploy-cluster.status)"
           operator: notin
-          values: ["None"]
+          values: ["None", "Failed"]
       params:
         - name: cluster-name
           value: "$(tasks.generate-cluster-name.results.cluster-name)"

diff --git a/ci/images/ci-runner/hack/bin/deploy-cluster.sh b/ci/images/ci-runner/hack/bin/deploy-cluster.sh
@@ -13,7 +13,7 @@ source "$SCRIPT_DIR/utils.sh"
 
 print_debug_info() {
     printf "Print debug info......\n" | indent 2
-    rosa describe cluster --cluster="$CLUSTER_NAME"
+    rosa --region "$REGION" describe cluster --cluster="$CLUSTER_NAME"
 }
 
 # Check all of clusteroperators are AVAILABLE
@@ -23,7 +23,7 @@ check_clusteroperators() {
     for operator in $operators; do
         # need to check if the operator is available or not in a loop
         retries=0
-        max_retries=10
+        max_retries=25
         # if the operator is not available, wait 60s and check again
         while [ "$retries" -lt "$max_retries" ]; do
             available=$(kubectl get co "$operator" -o jsonpath='{.status.conditions[?(@.type=="Available")].status}')
@@ -37,6 +37,10 @@ check_clusteroperators() {
         # if the operator is still not available after 10 times, exit 1
         if [ "$retries" -eq "$max_retries" ]; then
             echo "Operator $operator is not available" >&2
+            # print the status of all cluster operators 
+            kubectl get co
+            # print the status of the failed cluster operator
+            kubectl get co "$operator" -o yaml
             exit 1
         fi
     done
@@ -70,7 +74,7 @@ deploy_cluster() {
     api_url="$(echo "$admin_output" | grep -oP '(?<=oc login ).*(?= --username)')"
 
     # Use the admin account to login to the cluster in a loop until the account is active.
-    max_retries=5
+    max_retries=10
     retries=0
     export KUBECONFIG="$KUBECONFIG_DIR/kubeconfig"
     while ! oc login "$api_url" --username "$admin_user" --password "$admin_pass" > /dev/null 2>&1; do

diff --git a/developer/images/dependencies-update/hack/bin/tasks/update_binaries.sh b/developer/images/dependencies-update/hack/bin/tasks/update_binaries.sh
@@ -37,7 +37,7 @@ run_task() {
     for BINARY in "${BINARIES[@]}"; do
         update_binary
     done
-    if [ $(git diff shared/config/dependencies.sh | wc -l) != "0" ]; then
+    if [ "$(git diff shared/config/dependencies.sh | wc -l)" != "0" ]; then
         git diff shared/config/dependencies.sh \
             | grep "^+export" \
             | sed -e "s:^+export:-:" -e "s:_VERSION=: to :" \

diff --git a/developer/images/dependencies-update/hack/bin/update.sh b/developer/images/dependencies-update/hack/bin/update.sh
@@ -109,7 +109,7 @@ prepare_branch(){
 
 show_summary(){
   local updated="false"
-  if ! git diff --quiet $START_COMMIT..HEAD; then
+  if ! git diff --quiet "$START_COMMIT"..HEAD; then
       updated="true"
   fi