From f49193c45ea7b6d3862cc1516e858f37faf35c71 Mon Sep 17 00:00:00 2001
From: bertiethorpe <bertie443@gmail.com>
Date: Tue, 5 Aug 2025 15:54:44 +0000
Subject: [PATCH 1/3] Image sync CI to use leafcloud S3

---
 .github/bin/get-s3-image.sh         |  2 +-
 .github/workflows/s3-image-sync.yml | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/bin/get-s3-image.sh b/.github/bin/get-s3-image.sh
index d20838aca..98b91311d 100644
--- a/.github/bin/get-s3-image.sh
+++ b/.github/bin/get-s3-image.sh
@@ -17,7 +17,7 @@ if [ -n "$image_exists" ]; 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/$bucket_name/$image_name --progress=dot:giga
+    wget https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/$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
diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml
index d5ba6afb9..1b57212dd 100644
--- a/.github/workflows/s3-image-sync.yml
+++ b/.github/workflows/s3-image-sync.yml
@@ -1,4 +1,4 @@
-name: Upload CI-tested images to Arcus S3 and sync clouds
+name: Upload CI-tested images to Leafcloud S3 and sync clouds
 on:
   workflow_dispatch:
   push:
@@ -19,11 +19,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Write s3cmd configuration
-        run: |
-          echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg
-        shell: bash
-
       - name: Install s3cmd
         run: |
           sudo apt-get update
@@ -71,11 +66,6 @@ jobs:
           echo "${{ secrets[format('{0}_CLOUDS_YAML', env.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
         shell: bash
 
-      - name: Write s3cmd configuration
-        run: |
-          echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg
-        shell: bash
-
       - name: Install s3cmd and qemu-utils
         run: |
           sudo apt-get update

From a36f490e65cc84e65fbece5aca55f9fd0db46b66 Mon Sep 17 00:00:00 2001
From: bertiethorpe <bertie443@gmail.com>
Date: Wed, 6 Aug 2025 14:50:31 +0000
Subject: [PATCH 2/3] Use leafcloud s3 config

---
 .github/workflows/s3-image-sync.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml
index 1b57212dd..990125f1b 100644
--- a/.github/workflows/s3-image-sync.yml
+++ b/.github/workflows/s3-image-sync.yml
@@ -19,6 +19,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Write s3cmd configuration
+        run: |
+          echo "${{ secrets['LEAFCLOUD_S3_CFG'] }}" > ~/.s3cfg
+        shell: bash
+
       - name: Install s3cmd
         run: |
           sudo apt-get update
@@ -66,6 +71,11 @@ jobs:
           echo "${{ secrets[format('{0}_CLOUDS_YAML', env.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
         shell: bash
 
+      - name: Write s3cmd configuration
+        run: |
+          echo "${{ secrets['LEAFCLOUD_S3_CFG'] }}" > ~/.s3cfg
+        shell: bash
+
       - name: Install s3cmd and qemu-utils
         run: |
           sudo apt-get update

From 931eebe56dbc13d97939048016f59579eec44840 Mon Sep 17 00:00:00 2001
From: bertiethorpe <bertie443@gmail.com>
Date: Thu, 7 Aug 2025 11:06:16 +0000
Subject: [PATCH 3/3] Update release image workflows and upgrades.md bucket url

---
 .github/workflows/release-image.yml               | 2 +-
 .github/workflows/upload-release-image.yml.sample | 2 +-
 docs/upgrades.md                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml
index cb5553b9c..8fcddf586 100644
--- a/.github/workflows/release-image.yml
+++ b/.github/workflows/release-image.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Write s3cmd configuration
-        run: echo "${{ secrets.ARCUS_S3_CFG }}" > ~/.s3cfg
+        run: echo "${{ secrets.LEAFCLOUD_S3_CFG }}" > ~/.s3cfg
 
       - name: Install s3cmd
         run: |
diff --git a/.github/workflows/upload-release-image.yml.sample b/.github/workflows/upload-release-image.yml.sample
index 0b123bcf4..d1f930555 100644
--- a/.github/workflows/upload-release-image.yml.sample
+++ b/.github/workflows/upload-release-image.yml.sample
@@ -19,7 +19,7 @@ on:
     inputs:
       image_name:
         type: string
-        description: Image name from: (https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/{BUCKET_NAME})
+        description: Image name from: (https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/{BUCKET_NAME})
         required: true
       bucket_name:
         type: choice
diff --git a/docs/upgrades.md b/docs/upgrades.md
index 07f5f524c..c3f273e7e 100644
--- a/docs/upgrades.md
+++ b/docs/upgrades.md
@@ -60,7 +60,7 @@ All other commands should be run on the Ansible deploy host.
 1. Identify image(s) from the relevant [Slurm appliance release](https://github.com/stackhpc/ansible-slurm-appliance/releases), and download
    using the link on the release plus the image name, e.g. for an image `openhpc-RL9-250708-1547-1494192e`:
 
-        wget https://object.arcus.openstack.hpc.cam.ac.uk/swift/v1/AUTH_3a06571936a0424bb40bc5c672c4ccb1/openhpc-images/openhpc-RL9-250708-1547-1494192e
+        wget https://leafcloud.store/swift/v1/AUTH_f39848421b2747148400ad8eeae8d536/openhpc-images/openhpc-RL9-250708-1547-1494192e
 
     Note that some releases may not include new images. In this case use the image from the latest previous release with new images.