just use workflow_dispatch

Author: bertiethorpe

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

@@ -4,26 +4,23 @@ set -x
 
 # Variables (adjust these paths as necessary)
 S3_BUCKET="s3://openhpc-images"
-APPLIANCES_ENVIRONMENT_ROOT="$APPLIANCES_ENVIRONMENT_ROOT"
-MAIN_TF="$APPLIANCES_ENVIRONMENT_ROOT/terraform/main.tf"
 
 for IMAGE_OS in $IMAGE_LIST; do
-    echo "Extracting CI image name from $MAIN_TF"
-    ci_image=$(grep -oP 'openhpc-[0-9a-zA-Z-]+' "$MAIN_TF" | grep $IMAGE_OS)
+    
+    image_name=$1
+    echo "Checking if image $image_name exists in OpenStack"
+    image_exists=$(openstack image list --name "$image_name" -f value -c Name)
 
-    echo "Checking if image $ci_image exists in OpenStack"
-    image_exists=$(openstack image list --name "$ci_image" -f value -c Name)
-
-    if [ "$image_exists" == "$ci_image" ]; then
-        echo "Image $ci_image already exists in OpenStack."
+    if [ "$image_exists" == "$image_name" ]; then
+        echo "Image $image_name already exists in OpenStack."
     else
-        echo "Image $ci_image not found in OpenStack. Getting it from S3."
+        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/$ci_image
+        wget https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/openhpc-images/$image_name
 
-        echo "Uploading image $ci_image to OpenStack..."
-        openstack image create --file "$ci_image.qcow2" --disk-format qcow2 "$ci_image"
+        echo "Uploading image $image_name to OpenStack..."
+        openstack image create --file "$image_name.qcow2" --disk-format qcow2 "$image_name"
 
-        echo "Image $ci_image has been uploaded to OpenStack."
+        echo "Image $image_name has been uploaded to OpenStack."
     fi
 done

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

@@ -2,26 +2,27 @@
 name: Upload release images to client sites from s3
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
-      - master
-      - feat/fatimage-auto-upload
+    inputs:
+      image_name:
+        type: string
+        description: Image name from https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/openhpc-images/
+        required: true
+
+  # push:
+  #   branches:
+  #     - main
+  #     - master
+  #     - feat/fatimage-auto-upload
 
 jobs:
   image_upload:
     runs-on: ubuntu-22.04
     concurrency: ${{ github.ref }}
     env: 
       OS_CLOUD: openstack
-      CI_CLOUD: ${{ vars.CI_CLOUD }}
       IMAGE_LIST: "RL8 RL9"
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Record which cloud CI is running on
-        run: |
-          echo CI_CLOUD: ${{ vars.CI_CLOUD }}
+      - uses: actions/checkout@v4
 
       - name: Write clouds.yaml
         run: |
@@ -31,11 +32,9 @@ jobs:
 
       - name: Upload latest image if missing
         run: |
-          /usr/bin/python3.10 -m venv venv
+          python3 -m venv venv
           . venv/bin/activate
           pip install -U pip
-          pip install -r requirements.txt
-          ansible --version
+          pip install $(grep -o 'python-openstackclient[><=0-9\.]*' requirements.txt)
           . environments/.stackhpc/activate
-          ansible-galaxy collection install openstack.cloud
-          . .github/bin/get-s3-image.sh -o
+          bash .github/bin/get-s3-image.sh ${{ inputs.image_name }}