From 90ba3c1b30c20c4d3eb82d2cea26a11c0364e8fc Mon Sep 17 00:00:00 2001
From: bertiethorpe <bertie443@gmail.com>
Date: Mon, 27 Oct 2025 11:40:14 +0000
Subject: [PATCH 1/2] use set image properties tool for CI build and sync

---
 .github/workflows/fatimage.yml      | 5 +++++
 .github/workflows/s3-image-sync.yml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml
index 66f281943..95049edfa 100644
--- a/.github/workflows/fatimage.yml
+++ b/.github/workflows/fatimage.yml
@@ -118,6 +118,11 @@ jobs:
           . venv/bin/activate
           openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" || true
 
+      - name: Set image properties
+        run: |
+          . venv/bin/activate
+          . dev/image-set-properties.sh "${{ steps.manifest.outputs.image-id }}"
+
       - name: Upload manifest artifact
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml
index 3489dc62e..0d5290fb2 100644
--- a/.github/workflows/s3-image-sync.yml
+++ b/.github/workflows/s3-image-sync.yml
@@ -180,3 +180,8 @@ jobs:
             echo "No image ID found, skipping cleanup."
           fi
         shell: bash
+
+      - name: Set Glance image properties correctly for Slurm images
+        run: |
+          . venv/bin/activate
+          . dev/image-set-properties.sh "${{ env.TARGET_IMAGE }}"

From f2ce64e5298d10a04eb923c4b0667a8f6ae30a15 Mon Sep 17 00:00:00 2001
From: bertiethorpe <bertie443@gmail.com>
Date: Mon, 27 Oct 2025 14:22:32 +0000
Subject: [PATCH 2/2] move tool to run before cleanup step

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

diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml
index 0d5290fb2..86552b123 100644
--- a/.github/workflows/s3-image-sync.yml
+++ b/.github/workflows/s3-image-sync.yml
@@ -168,6 +168,11 @@ jobs:
           . venv/bin/activate
           bash .github/bin/get-s3-image.sh ${{ env.TARGET_IMAGE }} ${{ env.S3_BUCKET }}
 
+      - name: Set Glance image properties correctly for Slurm images
+        run: |
+          . venv/bin/activate
+          . dev/image-set-properties.sh "${{ env.TARGET_IMAGE }}"
+
       - name: Cleanup OpenStack Image (on error or cancellation)
         if: cancelled() || failure()
         run: |
@@ -180,8 +185,3 @@ jobs:
             echo "No image ID found, skipping cleanup."
           fi
         shell: bash
-
-      - name: Set Glance image properties correctly for Slurm images
-        run: |
-          . venv/bin/activate
-          . dev/image-set-properties.sh "${{ env.TARGET_IMAGE }}"