ci: use latest condition to check emqx status

emqx · Aug 3, 2022 · a331ed5 · a331ed5
1 parent 7a66aef
commit a331ed5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/.github/actions/deploy-emqx/action.yaml b/.github/actions/deploy-emqx/action.yaml
@@ -24,8 +24,11 @@ runs:
       shell: bash
       run: |
         while
-          [ -z "$(kubectl get ${{ inputs.kind }} ${{ inputs.name }} -o json | jq '.status.conditions[] | select((.type == "Running") and (.status == "True"))')" ];
+          condition="$(kubectl get ${{ inputs.kind }} ${{ inputs.name }} -o json | jq '.status.conditions[0]')";
+          [[ "$condition" == "null" ]] \
+          || [[ "$(echo $condition | jq --raw-output '.type')" != "Running" ]] \
+          || [[ "$(echo $condition | jq --raw-output '.status')" != "True" ]]
         do
-          echo "waiting ${{ inputs.name}}"
+          echo "waiting"
           sleep 1
-        done
+        done
diff --git a/.github/workflows/upgrade.yaml b/.github/workflows/upgrade.yaml
@@ -89,9 +89,12 @@ jobs:
         timeout-minutes: 5
         run: |
           while
-            [ -z "$(kubectl get ${{ matrix.emqx[0] }} emqx -o json | jq '.status.conditions[] | select((.type == "Running") and (.status == "True"))')" ];
+            condition="$(kubectl get ${{ matrix.emqx[0] }} emqx -o json | jq '.status.conditions[0]')";
+            [[ "$condition" == "null" ]] \
+            || [[ "$(echo $condition | jq --raw-output '.type')" != "Running" ]] \
+            || [[ "$(echo $condition | jq --raw-output '.status')" != "True" ]]
           do
-            echo "waiting ${{ matrix.emqx[0] }}"
+            echo "waiting"
             sleep 1
           done
       - name: Build image
@@ -126,9 +129,12 @@ jobs:
         run: |
           sleep 30
           while
-            [ -z "$(kubectl get ${{ matrix.emqx[0] }} emqx -o json | jq '.status.conditions[] | select((.type == "Running") and (.status == "True"))')" ];
+            condition="$(kubectl get ${{ matrix.emqx[0] }} emqx -o json | jq '.status.conditions[0]')";
+            [[ "$condition" == "null" ]] \
+            || [[ "$(echo $condition | jq --raw-output '.type')" != "Running" ]] \
+            || [[ "$(echo $condition | jq --raw-output '.status')" != "True" ]]
           do
-            echo "waiting ${{ matrix.emqx[0] }}"
+            echo "waiting"
             sleep 1
           done
       - if: failure()