From c57523b2e73839cfd17128b538c430a1217d1850 Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Tue, 25 Mar 2025 18:12:24 +0000 Subject: [PATCH 1/6] Attempt leafcloud build on local disk to compare speed --- environments/.stackhpc/LEAFCLOUD.pkrvars.hcl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl index db0b28b49..be19d7c2e 100644 --- a/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl +++ b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl @@ -1,5 +1,7 @@ flavor = "ec1.large" +use_blockstorage_volume = false volume_type = "unencrypted" +volume_size = null networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci ssh_keypair_name = "slurm-app-ci" ssh_private_key_file = "~/.ssh/id_rsa" From 80ee05b9ff71d7cdf8aa91b8d9cdb2e136c79b9e Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Tue, 25 Mar 2025 18:22:54 +0000 Subject: [PATCH 2/6] Comment out image disk format, to allow use_blockstorage_volume false --- packer/openstack.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl index 2ba0a1e63..3c3c0aca0 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 = "qcow2" image_visibility = var.image_visibility } From 2a2bd38ef4168cde32b1c93ffafd097b1701e625 Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Mon, 31 Mar 2025 17:08:53 +0100 Subject: [PATCH 3/6] Horrible hack to skip signature verified --- .github/workflows/fatimage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index c3b91fefa..221ff47d8 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -102,7 +102,8 @@ jobs: - name: Make image usable for further builds run: | . venv/bin/activate - openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" + # if there, remove signature_verified + openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" || true - name: Upload manifest artifact uses: actions/upload-artifact@v4 From 7a49b0180d02400c248b2ea0013dd98411886e32 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 7 Apr 2025 10:57:58 +0000 Subject: [PATCH 4/6] allow for extra build configuration --- .github/workflows/extra.yml | 1 + environments/.stackhpc/LEAFCLOUD.pkrvars.hcl | 2 -- packer/openstack.pkr.hcl | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index c91d6fe78..cbb545e57 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -101,6 +101,7 @@ jobs: -var "source_image_name=${{ fromJSON(env.FAT_IMAGES)['cluster_image'][matrix.build.source_image_name_key] }}" \ -var "image_name=${{ matrix.build.image_name }}" \ -var "inventory_groups=${{ matrix.build.inventory_groups }}" \ + -var "use_blockstorage_volume=true" \ -var "volume_size=${{ matrix.build.volume_size }}" \ openstack.pkr.hcl diff --git a/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl index be19d7c2e..db0b28b49 100644 --- a/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl +++ b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl @@ -1,7 +1,5 @@ flavor = "ec1.large" -use_blockstorage_volume = false volume_type = "unencrypted" -volume_size = null networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci ssh_keypair_name = "slurm-app-ci" ssh_private_key_file = "~/.ssh/id_rsa" diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl index 3c3c0aca0..5295c42e2 100644 --- a/packer/openstack.pkr.hcl +++ b/packer/openstack.pkr.hcl @@ -109,7 +109,7 @@ variable "manifest_output_path" { variable "use_blockstorage_volume" { type = bool - default = true + default = false } variable "volume_type" { @@ -119,7 +119,7 @@ variable "volume_type" { variable "volume_size" { type = number - default = 15 + default = null } variable "image_disk_format" { @@ -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 = var.use_blockstorage_volume ? "qcow2" : null image_visibility = var.image_visibility } From 0312bfd902523f3932c3da3f9429cf59833ec079 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 7 Apr 2025 15:09:33 +0000 Subject: [PATCH 5/6] bump CI images --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index ea8d46e4a..476755815 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-250401-1100-9a3cffdb", - "RL9": "openhpc-RL9-250401-1100-9a3cffdb" + "RL8": "openhpc-RL8-250407-1445-7a49b018", + "RL9": "openhpc-RL9-250407-1445-7a49b018" } } From 5fccc23b34dc6dc59bdf96fb5a8de6886f37bb7e Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 7 Apr 2025 16:36:02 +0000 Subject: [PATCH 6/6] add logic to unset signature_verified property --- .github/workflows/extra.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml index cbb545e57..bcbefb492 100644 --- a/.github/workflows/extra.yml +++ b/.github/workflows/extra.yml @@ -119,10 +119,16 @@ jobs: echo $IMAGE_ID > image-id.txt echo $IMAGE_NAME > image-name.txt - - name: Make image usable for further builds + - name: Make image usable for further builds (if signature_verified property exists) run: | . venv/bin/activate - openstack image unset --property signature_verified "${{ steps.manifest.outputs.image-id }}" + IMAGE_ID="${{ steps.manifest.outputs.image-id }}" + if openstack image show "$IMAGE_ID" -f json | jq -e '.properties.signature_verified' > /dev/null; then + echo "Unsetting signature_verified..." + openstack image unset --property signature_verified "$IMAGE_ID" + else + echo "signature_verified not set, skipping unset." + fi - name: Delete image for automatically-run workflows run: |