From 225219d3344f01fbd9d136c28615d630b6cda8fd Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Fri, 11 Apr 2025 13:22:00 +0100 Subject: [PATCH 1/9] Test if upload as raw from volume is quicker --- .github/workflows/extra.yml | 2 +- .github/workflows/fatimage.yml | 2 +- packer/openstack.pkr.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index c91d6fe78..6a075ae16 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -121,7 +121,7 @@ jobs: - name: Make image usable for further builds run: | . venv/bin/activate - openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" + openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" || true - name: Delete image for automatically-run workflows run: | diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index c3b91fefa..6faffe4c4 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -102,7 +102,7 @@ jobs: - name: Make image usable for further builds run: | . venv/bin/activate - openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" + openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" || true - name: Upload manifest artifact uses: actions/upload-artifact@v4 diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl index 2ba0a1e63..a821076d0 100644 --- a/packer/openstack.pkr.hcl +++ b/packer/openstack.pkr.hcl @@ -178,7 +178,7 @@ source "openstack" "openhpc" { ssh_bastion_private_key_file = var.ssh_bastion_private_key_file # Output image: - image_disk_format = "qcow2" + image_disk_format = "raw" image_visibility = var.image_visibility } From f18e9deb7d75a2b6a7185cecfd845733ebb7909c Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 14 Apr 2025 13:10:05 +0000 Subject: [PATCH 2/9] test raw fatimage on top of raw fat image --- .github/workflows/fatimage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 6faffe4c4..e580ade1e 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -23,10 +23,10 @@ jobs: matrix: # build RL8, RL9 build: - image_name: openhpc-RL8 - source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2 + source_image_name: openhpc-RL8-250409-0953-f5aefb1e inventory_groups: control,compute,login,update - image_name: openhpc-RL9 - source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2 + source_image_name: openhpc-RL9-250409-0953-f5aefb1e inventory_groups: control,compute,login,update env: ANSIBLE_FORCE_COLOR: True From df91ddacd2caf9ea0e45e9ddca8e269fbe8333fc Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 14 Apr 2025 14:09:18 +0000 Subject: [PATCH 3/9] bump raw volume-backed images --- .github/workflows/fatimage.yml | 4 ++-- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index e580ade1e..6faffe4c4 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -23,10 +23,10 @@ jobs: matrix: # build RL8, RL9 build: - image_name: openhpc-RL8 - source_image_name: openhpc-RL8-250409-0953-f5aefb1e + source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2 inventory_groups: control,compute,login,update - image_name: openhpc-RL9 - source_image_name: openhpc-RL9-250409-0953-f5aefb1e + source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2 inventory_groups: control,compute,login,update env: ANSIBLE_FORCE_COLOR: True diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 3f449a8bf..9a0eff05b 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250409-0953-f5aefb1e", - "RL9": "openhpc-RL9-250409-0953-f5aefb1e" + "RL8": "openhpc-RL8-250411-1228-225219d3", + "RL9": "openhpc-RL9-250411-1228-225219d3" } } From 9b9398f96ac789c05b41a93e8b97fb193d6bf248 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 15 Apr 2025 15:02:09 +0000 Subject: [PATCH 4/9] convert image to qcow2 during sync workflow --- .github/workflows/s3-image-sync.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml index fefe835a2..827baa79b 100644 --- a/.github/workflows/s3-image-sync.yml +++ b/.github/workflows/s3-image-sync.yml @@ -26,6 +26,7 @@ jobs: - name: Install s3cmd run: | + sudo apt-get update sudo apt-get --yes install s3cmd - name: Cleanup S3 bucket @@ -75,9 +76,10 @@ jobs: echo "${{ secrets['ARCUS_S3_CFG'] }}" > ~/.s3cfg shell: bash - - name: Install s3cmd + - name: Install s3cmd and qemu-utils run: | - sudo apt-get --yes install s3cmd + sudo apt-get update + sudo apt-get --yes install s3cmd qemu-utils - name: Retrieve image name run: | @@ -88,7 +90,13 @@ jobs: - name: Download image to runner run: | . venv/bin/activate - openstack image save --file ${{ env.TARGET_IMAGE }} ${{ env.TARGET_IMAGE }} + openstack image save --file "${{ env.TARGET_IMAGE }}.raw" "${{ env.TARGET_IMAGE }}" + shell: bash + + - name: Convert image to QCOW2 + run: | + . venv/bin/activate + qemu-img convert -f raw -O qcow2 "${{ env.TARGET_IMAGE }}.raw" "${{ env.TARGET_IMAGE }}" shell: bash - name: Upload Image to S3 From ca92f4db5384f0c7ecb21c65a2d40bca33bba02b Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 16 Apr 2025 08:26:52 +0000 Subject: [PATCH 5/9] test large runner --- .github/workflows/s3-image-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml index 827baa79b..5151f202a 100644 --- a/.github/workflows/s3-image-sync.yml +++ b/.github/workflows/s3-image-sync.yml @@ -12,7 +12,7 @@ env: jobs: s3_cleanup: - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04-2x1 concurrency: ${{ github.workflow }}-${{ github.ref }} strategy: fail-fast: false From 8463fab2d138df41d8885ba525448b65834f52a2 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 16 Apr 2025 08:39:15 +0000 Subject: [PATCH 6/9] try qemu compression --- .github/workflows/s3-image-sync.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml index 5151f202a..eb0bdf5f5 100644 --- a/.github/workflows/s3-image-sync.yml +++ b/.github/workflows/s3-image-sync.yml @@ -12,7 +12,7 @@ env: jobs: s3_cleanup: - runs-on: ubuntu-22.04-2x1 + runs-on: ubuntu-22.04 concurrency: ${{ github.workflow }}-${{ github.ref }} strategy: fail-fast: false @@ -96,7 +96,7 @@ jobs: - name: Convert image to QCOW2 run: | . venv/bin/activate - qemu-img convert -f raw -O qcow2 "${{ env.TARGET_IMAGE }}.raw" "${{ env.TARGET_IMAGE }}" + qemu-img convert -f raw -O qcow2 -c "${{ env.TARGET_IMAGE }}.raw" "${{ env.TARGET_IMAGE }}" shell: bash - name: Upload Image to S3 From 527845898e6460452e0833efa5e4135250034f4f Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 16 Apr 2025 09:16:11 +0000 Subject: [PATCH 7/9] free up space on runner --- .github/workflows/s3-image-sync.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml index eb0bdf5f5..d5ba6afb9 100644 --- a/.github/workflows/s3-image-sync.yml +++ b/.github/workflows/s3-image-sync.yml @@ -87,10 +87,21 @@ jobs: echo "TARGET_IMAGE=${TARGET_IMAGE}" >> "$GITHUB_ENV" shell: bash + - name: Clear up some space on runner + run: | + df -h + sudo rm -rf /usr/share/dotnet + sudo rm -rf /opt/ghc + sudo rm -rf "/usr/local/share/boost" + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + sudo apt-get clean + df -h + - name: Download image to runner run: | . venv/bin/activate openstack image save --file "${{ env.TARGET_IMAGE }}.raw" "${{ env.TARGET_IMAGE }}" + df -h shell: bash - name: Convert image to QCOW2 From fd7e60059c86d9dd831f9a9ea2a219a798cf2a5a Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Tue, 22 Apr 2025 08:28:50 +0000 Subject: [PATCH 8/9] test raw 9.5 base image --- .github/workflows/fatimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 6faffe4c4..103c3c736 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -26,7 +26,7 @@ jobs: source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2 inventory_groups: control,compute,login,update - image_name: openhpc-RL9 - source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.qcow2 + source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.raw inventory_groups: control,compute,login,update env: ANSIBLE_FORCE_COLOR: True From 5e3b5d4b1f0400e8ecdfa1b47a18df5992dd9cfe Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Fri, 25 Apr 2025 16:34:09 +0100 Subject: [PATCH 9/9] Update rocky 8 to raw --- .github/workflows/fatimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 103c3c736..38f55db04 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -23,7 +23,7 @@ jobs: matrix: # build RL8, RL9 build: - image_name: openhpc-RL8 - source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.qcow2 + source_image_name: Rocky-8-GenericCloud-Base-8.10-20240528.0.x86_64.raw inventory_groups: control,compute,login,update - image_name: openhpc-RL9 source_image_name: Rocky-9-GenericCloud-Base-9.5-20241118.0.x86_64.raw