set matrix exclusion dynamically

stackhpc · Oct 14, 2024 · 3e48074 · 3e48074
1 parent 3c1271b
commit 3e48074
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml
@@ -47,12 +47,15 @@ jobs:
       ANSIBLE_FORCE_COLOR: True
       OS_CLOUD: openstack
       CI_CLOUD: ${{ vars.CI_CLOUD }}
+    outputs:
+      ci_cloud: ${{ steps.ci.outputs.CI_CLOUD }}
     steps:
       - uses: actions/checkout@v2
 
       - name: Record which cloud CI is running on
+        id: ci
         run: |
-          echo CI_CLOUD: ${{ env.CI_CLOUD }}
+          echo "CI_CLOUD=${{ env.CI_CLOUD }}" >> "$GITHUB_OUTPUT"
 
       - name: Setup environment
         run: |
@@ -111,7 +114,7 @@ jobs:
           - RL9
           - RL9-cuda
         exclude: 
-          - cloud: LEAFCLOUD
+          - cloud: ${{ needs.image_upload.outputs.ci_cloud }}
 
     env:
       ANSIBLE_FORCE_COLOR: True

diff --git a/.github/workflows/upload-release-image.yml.sample b/.github/workflows/upload-release-image.yml.sample
@@ -53,7 +53,7 @@ jobs:
           bash .github/bin/get-s3-image.sh ${{ inputs.image_name }} ${{ inputs.bucket_name }}
 
       - name: Cleanup OpenStack Image (on error or cancellation)
-        if: cancelled()
+        if: cancelled() || failure()
         run: |
           . venv/bin/activate
           image_hanging=$(openstack image list --name ${{ inputs.image_name }} -f value -c ID -c Status | grep -v ' active$' | awk '{print $1}')