Skip to content

Attempt leafcloud build on local disk to compare speed #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Attempt leafcloud build on local disk to compare speed #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c57523b
Attempt leafcloud build on local disk to compare speed
JohnGarbutt Mar 25, 2025
80ee05b
Comment out image disk format, to allow use_blockstorage_volume false
JohnGarbutt Mar 25, 2025
2a2bd38
Horrible hack to skip signature verified
JohnGarbutt Mar 31, 2025
d6b4513
Merge branch 'main' into temp/try-image-build-without-volume
bertiethorpe Apr 1, 2025
2b87854
Merge branch 'main' into temp/try-image-build-without-volume
bertiethorpe Apr 7, 2025
7a49b01
allow for extra build configuration
bertiethorpe Apr 7, 2025
0312bfd
bump CI images
bertiethorpe Apr 7, 2025
5fccc23
add logic to unset signature_verified property
bertiethorpe Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this will be for all clouds. Is that OK? If not, I would set it in e.g. environments/.stackhpc/LEAFCLOUD.pkrvars.hcl instead.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/stackhpc/ansible-slurm-appliance/actions/runs/14333297338

Disk image build works for SMS, so probably okay to set for all clouds

-var "volume_size=${{ matrix.build.volume_size }}" \
openstack.pkr.hcl

Expand All @@ -118,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)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this check here, but not for the same in the fatimage workflow below?

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: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/fatimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
6 changes: 3 additions & 3 deletions packer/openstack.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ variable "manifest_output_path" {

variable "use_blockstorage_volume" {
type = bool
default = true
default = false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're doing this, can you modify docs/image-build.md b/c it currently says vol backed is default. Or, you could just set it to false in CI.

}

variable "volume_type" {
Expand All @@ -119,7 +119,7 @@ variable "volume_type" {

variable "volume_size" {
type = number
default = 15
default = null
}

variable "image_disk_format" {
Expand Down Expand Up @@ -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

}
Expand Down
Loading