Merge pull request #6019 from shaneknapp/fix-hub-deploy-script

[DH-301] more tweaking and better logic flow + file rename to something sane
berkeley-dsep-infra · Aug 26, 2024 · 2e8b390 · 2e8b390
2 parents 522bb9e + ec0286b
commit 2e8b390
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/...kflows/deploy-jupyterhub-base-images.yaml → .github/workflows/deploy-all-hubs.yaml b/...kflows/deploy-jupyterhub-base-images.yaml → .github/workflows/deploy-all-hubs.yaml
diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml
@@ -28,21 +28,23 @@ jobs:
         run: |
           echo "PR labels: ${{ steps.pr-labels.outputs.labels }}"
           HUBS=()
-          for label in $(echo -e "${{ steps.pr-labels.outputs.labels }}"); do
-            if [[ "$label" == hub-* ]]; then
-              label=$(echo $label | awk -F'-' '{print $2}')
-              HUBS+="$label"
-              echo "DEPLOY=1" >> $GITHUB_ENV
-            fi
-          done
           # If the PR labels "hub-images" or "jupyterhub-deployment" are present, this
           # means the base hub image has changed, and all hubs (staging or prod) need to
-          # be redeployed.  This workflow will not run in that case.
+          # be redeployed.  The rest of this job will not run in that case.
           if [ -n $GITHUB_PR_LABEL_HUB_IMAGES ] || [ -n $GITHUB_PR_LABEL_JUPYTERHUB_DEPLOYMENT ]; then
             echo "Base hub image has changed, not deploying individual hubs to staging"
             echo "DEPLOY=0" >> $GITHUB_ENV
+          else
+            # deploy any hubs that have been labeled for deployment
+            for label in $(echo -e "${{ steps.pr-labels.outputs.labels }}"); do
+              if [[ "$label" == hub-* ]]; then
+                label=$(echo $label | awk -F'-' '{print $2}')
+                HUBS+="$label"
+                echo "DEPLOY=1" >> $GITHUB_ENV
+              fi
+            done
+            echo "DEPLOY_HUBS=${HUBS[@]}" >> $GITHUB_ENV
           fi
-          echo "DEPLOY_HUBS=${HUBS[@]}" >> $GITHUB_ENV
 
       - name: Check out the image repo
         if: ${{ env.DEPLOY }}
@@ -127,21 +129,23 @@ jobs:
         run: |
           echo "PR labels: ${{ steps.pr-labels.outputs.labels }}"
           HUBS=()
-          for label in $(echo -e "${{ steps.pr-labels.outputs.labels }}"); do
-            if [[ "$label" == hub-* ]]; then
-              label=$(echo $label | awk -F'-' '{print $2}')
-              HUBS+="$label"
-              echo "DEPLOY=1" >> $GITHUB_ENV
-            fi
-          done
           # If the PR labels "hub-images" or "jupyterhub-deployment" are present, this
           # means the base hub image has changed, and all hubs (staging or prod) need to
-          # be redeployed.  This workflow will not run in that case.
+          # be redeployed.  The rest of this job will not run in that case.
           if [ -n $GITHUB_PR_LABEL_HUB_IMAGES ] || [ -n $GITHUB_PR_LABEL_JUPYTERHUB_DEPLOYMENT ]; then
             echo "Base hub image has changed, not deploying individual hubs to prod"
             echo "DEPLOY=0" >> $GITHUB_ENV
+          else
+            # deploy any hubs that have been labeled for deployment
+            for label in $(echo -e "${{ steps.pr-labels.outputs.labels }}"); do
+              if [[ "$label" == hub-* ]]; then
+                label=$(echo $label | awk -F'-' '{print $2}')
+                HUBS+="$label"
+                echo "DEPLOY=1" >> $GITHUB_ENV
+              fi
+            done
+            echo "DEPLOY_HUBS=${HUBS[@]}" >> $GITHUB_ENV
           fi
-          echo "DEPLOY_HUBS=${HUBS[@]}" >> $GITHUB_ENV
 
       - name: Setup python
         if: ${{ env.DEPLOY }}