pick bucket and handle cancellation

Author: bertiethorpe

.github/bin/get-s3-image.sh

@@ -3,6 +3,7 @@
 set -ex
 
 image_name=$1
+bucket_name=$2
 echo "Checking if image $image_name exists in OpenStack"
 image_exists=$(openstack image list --name "$image_name" -f value -c Name)
 
@@ -11,7 +12,7 @@ if [ "$image_exists" == "$image_name" ]; then
 else
     echo "Image $image_name not found in OpenStack. Getting it from S3."
 
-    wget https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/openhpc-images/$image_name --progress=dot:giga
+    wget https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/$bucket_name/$image_name --progress=dot:giga
 
     echo "Uploading image $image_name to OpenStack..."
     openstack image create --file "$image_name" --disk-format qcow2 "$image_name" --progress

.github/workflows/upload-release-image.yml

@@ -5,22 +5,22 @@ on:
     inputs:
       image_name:
         type: string
-        description: Image name from https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/openhpc-images/
+        description: Image name from https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/{BUCKET_NAME}/
         required: true
-
-  # push:
-  #   branches:
-  #     - main
-  #     - master
-  #     - feat/fatimage-auto-upload
+      bucket_name:
+        type: choice
+        required: true
+        description: Bucket name
+        options:
+          - openhpc-images
+          # - openhpc-images-prerelease
 
 jobs:
   image_upload:
     runs-on: ubuntu-22.04
     concurrency: ${{ github.ref }}
     env: 
       OS_CLOUD: openstack
-      IMAGE_LIST: "RL8 RL9"
     steps:
       - uses: actions/checkout@v4
 
@@ -36,4 +36,21 @@ jobs:
           . venv/bin/activate
           pip install -U pip
           pip install $(grep -o 'python-openstackclient[><=0-9\.]*' requirements.txt)
-          bash .github/bin/get-s3-image.sh ${{ inputs.image_name }}
+          bash .github/bin/get-s3-image.sh ${{ inputs.image_name }} ${{ inputs.bucket_name }}
+
+      - name: Cleanup OpenStack Image (on error or cancellation)
+        if: cancelled()
+        run: |
+          . venv/bin/activate
+          image_hanging=$(openstack image list --name ${{ inputs.image_name }} -f value -c ID)
+          if [ -n "$image_hanging" ]; then
+            echo "Cleaning up OpenStack image with ID: $image_hanging"
+            openstack image delete $image_hanging
+          else
+            echo "No image ID found, skipping cleanup."
+          fi
+        shell: bash
+
+      - name: Confirm Success
+        if: success()
+        run: echo "Deployment succeeded, no cleanup needed."