fix cloud config parse

Author: bertiethorpe

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

@@ -1,26 +1,20 @@
 #!/bin/bash
 
-set -x
+set -ex
 
-# Variables (adjust these paths as necessary)
-S3_BUCKET="s3://openhpc-images"
+image_name=$1
+echo "Checking if image $image_name exists in OpenStack"
+image_exists=$(openstack image list --name "$image_name" -f value -c Name)
 
-for IMAGE_OS in $IMAGE_LIST; do
-    
-    image_name=$1
-    echo "Checking if image $image_name exists in OpenStack"
-    image_exists=$(openstack image list --name "$image_name" -f value -c Name)
+if [ "$image_exists" == "$image_name" ]; then
+    echo "Image $image_name already exists in OpenStack."
+else
+    echo "Image $image_name not found in OpenStack. Getting it from S3."
 
-    if [ "$image_exists" == "$image_name" ]; then
-        echo "Image $image_name already exists in OpenStack."
-    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/openhpc-images/$image_name
+    echo "Uploading image $image_name to OpenStack..."
+    openstack image create --file "$image_name.qcow2" --disk-format qcow2 "$image_name"
 
-        echo "Uploading image $image_name to OpenStack..."
-        openstack image create --file "$image_name.qcow2" --disk-format qcow2 "$image_name"
-
-        echo "Image $image_name has been uploaded to OpenStack."
-    fi
-done
+    echo "Image $image_name has been uploaded to OpenStack."
+fi

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

@@ -27,7 +27,7 @@ jobs:
       - name: Write clouds.yaml
         run: |
           mkdir -p ~/.config/openstack/
-          echo "${{ secrets[format('{0}_CLOUDS_YAML', vars.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
+          echo "${{ secrets.OS_CLOUD_YAML }}" > ~/.config/openstack/clouds.yaml
         shell: bash
 
       - name: Upload latest image if missing
@@ -36,5 +36,4 @@ jobs:
           . venv/bin/activate
           pip install -U pip
           pip install $(grep -o 'python-openstackclient[><=0-9\.]*' requirements.txt)
-          . environments/.stackhpc/activate
           bash .github/bin/get-s3-image.sh ${{ inputs.image_name }}