update CI workflow

PurdueAF · Aug 9, 2023 · 2b14200 · 2b14200
1 parent 3e93027
commit 2b14200
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -32,10 +32,18 @@ jobs:
           helm repo update
           helm upgrade --cleanup-on-fail --install cmshub jupyterhub/jupyterhub --values values.yaml
 
-      - name: Wait for JupyterHub container to start or fail
+      - name: Install Prometheus & Grafana
+        run: |
+          cd ../monitoring/prometheus
+          helm upgrade --install prometheus . --values values.yaml
+          cd ../grafana
+          helm upgrade --install grafana . --values values.yaml
+          kubectl get pods
+
+      - name: Check the status of JupyterHub
         run: |
           while true; do
-            POD_STATUS=$(kubectl get pod -l app=jupyterhub -l component=hub -o jsonpath='{.status.phase}')
+            POD_STATUS=$(kubectl get pod -l app=jupyterhub -l component=hub -o jsonpath='{.items[*].status.phase}')
             if [[ "$POD_STATUS" == "Failed" ]]; then
               echo "Pod $POD_NAME is in a Failed state."
               exit 1
@@ -48,11 +56,3 @@ jobs:
             fi
           done
         timeout-minutes: 2
-
-      - name: Install Prometheus & Grafana
-        run: |
-          cd ../monitoring/prometheus
-          helm upgrade --install prometheus . --values values.yaml
-          cd ../grafana
-          helm upgrade --install grafana . --values values.yaml
-          kubectl get pods