From 6852fa9bd0e92c2fa250c8bc00860cb8a822b5ca Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 14 Aug 2024 13:27:45 +0000 Subject: [PATCH 01/15] configure SMS deployment --- environments/.stackhpc/inventory/group_vars/all/bastion.yml | 3 +++ environments/.stackhpc/terraform/SMS.tfvars | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 environments/.stackhpc/terraform/SMS.tfvars diff --git a/environments/.stackhpc/inventory/group_vars/all/bastion.yml b/environments/.stackhpc/inventory/group_vars/all/bastion.yml index 94287827c..7a9e204f0 100644 --- a/environments/.stackhpc/inventory/group_vars/all/bastion.yml +++ b/environments/.stackhpc/inventory/group_vars/all/bastion.yml @@ -6,6 +6,9 @@ bastion_config: LEAFCLOUD: user: slurm-app-ci ip: 195.114.30.222 + SMS: + user: bertie + ip: 185.45.78.150 # NB: The bastion_{user,ip} variables are used directly in the CI workflow too bastion_user: "{{ bastion_config[ci_cloud].user }}" bastion_ip: "{{ bastion_config[ci_cloud].ip }}" diff --git a/environments/.stackhpc/terraform/SMS.tfvars b/environments/.stackhpc/terraform/SMS.tfvars new file mode 100644 index 000000000..66113a68d --- /dev/null +++ b/environments/.stackhpc/terraform/SMS.tfvars @@ -0,0 +1,4 @@ +cluster_net = "stackhpc-ipv4-geneve" +cluster_subnet = "stackhpc-ipv4-geneve-subnet" +control_node_flavor = "general.v1.small" +other_node_flavor = "general.v1.small" \ No newline at end of file From 97908740c155e9583941f363e6edc29e4f75b00c Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 14 Aug 2024 15:35:27 +0000 Subject: [PATCH 02/15] add slurm-app-ci user --- environments/.stackhpc/inventory/group_vars/all/bastion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/.stackhpc/inventory/group_vars/all/bastion.yml b/environments/.stackhpc/inventory/group_vars/all/bastion.yml index 7a9e204f0..a1001e862 100644 --- a/environments/.stackhpc/inventory/group_vars/all/bastion.yml +++ b/environments/.stackhpc/inventory/group_vars/all/bastion.yml @@ -7,7 +7,7 @@ bastion_config: user: slurm-app-ci ip: 195.114.30.222 SMS: - user: bertie + user: slurm-app-ci ip: 185.45.78.150 # NB: The bastion_{user,ip} variables are used directly in the CI workflow too bastion_user: "{{ bastion_config[ci_cloud].user }}" From cc515dadd0e2f758c557f5618c18e46e5f79b171 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 15 Aug 2024 11:10:54 +0000 Subject: [PATCH 03/15] bastion config --- environments/.stackhpc/SMS.pkrvars.hcl | 7 +++++++ environments/.stackhpc/bastion_fingerprints | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 environments/.stackhpc/SMS.pkrvars.hcl diff --git a/environments/.stackhpc/SMS.pkrvars.hcl b/environments/.stackhpc/SMS.pkrvars.hcl new file mode 100644 index 000000000..b88106fe8 --- /dev/null +++ b/environments/.stackhpc/SMS.pkrvars.hcl @@ -0,0 +1,7 @@ +flavor = "general.v1.small" +networks = ["e2b9e59f-43da-4e1c-b558-dc9da4c0d738"] # stackhpc-ipv4-geneve +ssh_keypair_name = "slurm-app-ci" +ssh_private_key_file = "~/.ssh/id_rsa" +ssh_bastion_username = "slurm-app-ci" +ssh_bastion_host = "185.45.78.150" +ssh_bastion_private_key_file = "~/.ssh/id_rsa" \ No newline at end of file diff --git a/environments/.stackhpc/bastion_fingerprints b/environments/.stackhpc/bastion_fingerprints index 8939708a1..8596c1694 100644 --- a/environments/.stackhpc/bastion_fingerprints +++ b/environments/.stackhpc/bastion_fingerprints @@ -2,4 +2,7 @@ |1|whGSPLhKW4xt/7PWOZ1treg3PtA=|F5gwV8j0JYWDzjb6DvHHaqO+sxs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCpCG881Gt3dr+nuVIC2uGEQkeVwG6WDdS1WcCoxXC7AG+Oi5bfdqtf4IfeLpWmeuEaAaSFH48ODFr76ViygSjU= |1|0V6eQ1FKO5NMKaHZeNFbw62mrJs=|H1vuGTbbtZD2MEgZxQf1PXPk+yU= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnOtYByM3s2qvRT8SS1sn5z5sbwjzb1alm0B3emPcHJ |1|u3QVAK9R2x7Z3uKNj+0vDEIekl0=|yy09Q0Kw472+J7bjFkmir28x3lE= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNuXZkH7ppkTGNGKzmGEvAnvlLO2D+YtlJw1m3P16FV -|1|nOHeibGxhsIFnhW0flRwnirJjlg=|IJ8nJB355LGI+1U3Wpvdcgdf0ek= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGG6DieKAdgiTCqRmF2HD0dJi9DuORblPzbridniICsw \ No newline at end of file +|1|nOHeibGxhsIFnhW0flRwnirJjlg=|IJ8nJB355LGI+1U3Wpvdcgdf0ek= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGG6DieKAdgiTCqRmF2HD0dJi9DuORblPzbridniICsw +185.45.78.150 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDkOPL7fQiLFrg+/mDbff+jr+mQkI8pAkS5aBKOaknKuzTGrxILO5XSbyTJxyEwIKzZHBCUH2w99yv3oCqiphYp7iLLdPKl98RRnAXneJ1mo7nJfaTOSj5FGFf/AeHFZFa18B8zZrfFOOTGdEXeQpcik6R2A0/o4ZGE9rUg/dEoLQpFp8z+XRhsbNWgZ4a63oWrt02p+zdXPZ+Plir56j0qyQXoOo/BjEoLHs0aah61jfEOcJAcgpTrev/vdhBqJCgEXkf6AhiKidTnQxw7G/5C/BKtJbtuBWMgWZKcDf/uCzRkXaHNEggcJi1e6jvpUkvPLUfpRnNiBWLzehw3xZL4NicMM6D2TU0TSpB+UfEOLR0jyhCGKRQQN4jnj8ll0h+JBE6a0KnyKG+B5mXrD7THYu848jXUmBnxIaeor/NUItKEnCL0hzvAygOnniBN6uvtszSJHoGe8WbChLYJcoH3mOQTUH0k9RhXSEe90gSlLfRQInU+uzf2/qc6pffcKuc= +185.45.78.150 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCB8R1BElOz4geGfCcb/ObF5n4Par+g9AaXQW5FU1ccgnPA59uJeOEALPeXAgJijVOhwqTdIkIoWYWeGdlud9Wc= +185.45.78.150 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNuXZkH7ppkTGNGKzmGEvAnvlLO2D+YtlJw1m3P16FV From 27958e106e165f6527d8801a0f7a60e41fefbfca Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Thu, 15 Aug 2024 13:14:14 +0000 Subject: [PATCH 04/15] allow overriding CI_CLOUD for PRs using label --- .github/workflows/fatimage.yml | 4 ++++ .github/workflows/stackhpc.yml | 28 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 31fcc789a..0d3ce197e 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -29,6 +29,10 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Record settings for CI cloud + run: | + echo CI_CLOUD: ${{ env.CI_CLOUD }} + - name: Setup ssh run: | set -x diff --git a/.github/workflows/stackhpc.yml b/.github/workflows/stackhpc.yml index 1813eac13..819658d76 100644 --- a/.github/workflows/stackhpc.yml +++ b/.github/workflows/stackhpc.yml @@ -35,19 +35,33 @@ jobs: ANSIBLE_FORCE_COLOR: True OS_CLOUD: openstack TF_VAR_cluster_name: slurmci-${{ matrix.os_version }}-${{ github.run_number }} - CI_CLOUD: ${{ vars.CI_CLOUD }} + CI_CLOUD: ${{ vars.CI_CLOUD }} # default from repo settings steps: - uses: actions/checkout@v2 + - name: Override CI_CLOUD if PR label is present + if: ${{ github.event_name == 'pull_request' }} + run: | + # Iterate over the labels + labels=$(echo '${{ toJSON(github.event.pull_request.labels) }}' | jq -r '.[].name') + echo $labels + for label in $labels; do + if [[ $label == CI_CLOUD=* ]]; then + # Extract the value after 'CI_CLOUD=' + CI_CLOUD_OVERRIDE=${label#CI_CLOUD=} + echo "CI_CLOUD=${CI_CLOUD_OVERRIDE}" >> $GITHUB_ENV + fi + done + - name: Record settings for CI cloud run: | - echo CI_CLOUD: ${{ vars.CI_CLOUD }} + echo CI_CLOUD: ${{ env.CI_CLOUD }} - name: Setup ssh run: | set -x mkdir ~/.ssh - echo "${{ secrets[format('{0}_SSH_KEY', vars.CI_CLOUD)] }}" > ~/.ssh/id_rsa + echo "${{ secrets[format('{0}_SSH_KEY', env.CI_CLOUD)] }}" > ~/.ssh/id_rsa chmod 0600 ~/.ssh/id_rsa shell: bash @@ -70,7 +84,7 @@ jobs: - name: Write clouds.yaml run: | mkdir -p ~/.config/openstack/ - echo "${{ secrets[format('{0}_CLOUDS_YAML', vars.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml + echo "${{ secrets[format('{0}_CLOUDS_YAML', env.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml shell: bash - name: Setup environment-specific inventory/terraform inputs @@ -88,7 +102,7 @@ jobs: . venv/bin/activate . environments/.stackhpc/activate cd $APPLIANCES_ENVIRONMENT_ROOT/terraform - terraform apply -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars" + terraform apply -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars" env: TF_VAR_os_version: ${{ matrix.os_version }} @@ -97,7 +111,7 @@ jobs: . venv/bin/activate . environments/.stackhpc/activate cd $APPLIANCES_ENVIRONMENT_ROOT/terraform - terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars" + terraform destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars" if: failure() && steps.provision_servers.outcome == 'failure' env: TF_VAR_os_version: ${{ matrix.os_version }} @@ -197,7 +211,7 @@ jobs: . venv/bin/activate . environments/.stackhpc/activate cd $APPLIANCES_ENVIRONMENT_ROOT/terraform - terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars" + terraform destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars" if: ${{ success() || cancelled() }} env: TF_VAR_os_version: ${{ matrix.os_version }} From 7581f26dbd0ed014e5aa398dfd26e1ce012910e0 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Fri, 16 Aug 2024 09:02:21 +0000 Subject: [PATCH 05/15] choose cloud for fatimage workflow_dispatch --- .github/workflows/fatimage.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 0d3ce197e..68d3f4315 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -2,6 +2,15 @@ name: Build fat image 'on': workflow_dispatch: + inputs: + ci_cloud: + description: 'Select the CI_CLOUD' + required: true + type: choice + options: + - LEAFCLOUD + - ARCUS + - SMS concurrency: group: ${{ github.ref }}-{{ matrix.os_version }}-{{ matrix.build }} # to branch/PR + OS + build cancel-in-progress: true @@ -25,7 +34,7 @@ jobs: env: ANSIBLE_FORCE_COLOR: True OS_CLOUD: openstack - CI_CLOUD: ${{ vars.CI_CLOUD }} + CI_CLOUD: ${{ github.event.inputs.ci_cloud }} steps: - uses: actions/checkout@v2 @@ -37,7 +46,7 @@ jobs: run: | set -x mkdir ~/.ssh - echo "${{ secrets[format('{0}_SSH_KEY', vars.CI_CLOUD)] }}" > ~/.ssh/id_rsa + echo "${{ secrets[format('{0}_SSH_KEY', env.CI_CLOUD)] }}" > ~/.ssh/id_rsa chmod 0600 ~/.ssh/id_rsa shell: bash @@ -51,7 +60,7 @@ jobs: - name: Write clouds.yaml run: | mkdir -p ~/.config/openstack/ - echo "${{ secrets[format('{0}_CLOUDS_YAML', vars.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml + echo "${{ secrets[format('{0}_CLOUDS_YAML', env.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml shell: bash - name: Setup environment @@ -66,7 +75,7 @@ jobs: . environments/.stackhpc/activate cd packer/ packer init . - PACKER_LOG=1 packer build -on-error=${{ vars.PACKER_ON_ERROR }} -only=${{ matrix.build }} -var-file=$PKR_VAR_environment_root/${{ vars.CI_CLOUD }}.pkrvars.hcl openstack.pkr.hcl + PACKER_LOG=1 packer build -on-error=${{ vars.PACKER_ON_ERROR }} -only=${{ matrix.build }} -var-file=$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl openstack.pkr.hcl env: PKR_VAR_os_version: ${{ matrix.os_version }} From 4f357241d0715c3c154ffe74d5ae6bf83f25b79a Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 19 Aug 2024 10:32:39 +0000 Subject: [PATCH 06/15] packer build qcows --- environments/.stackhpc/SMS.pkrvars.hcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/environments/.stackhpc/SMS.pkrvars.hcl b/environments/.stackhpc/SMS.pkrvars.hcl index b88106fe8..e78994878 100644 --- a/environments/.stackhpc/SMS.pkrvars.hcl +++ b/environments/.stackhpc/SMS.pkrvars.hcl @@ -1,4 +1,7 @@ flavor = "general.v1.small" +use_blockstorage_volume = true +volume_size = 15 # GB +image_disk_format = "qcow2" networks = ["e2b9e59f-43da-4e1c-b558-dc9da4c0d738"] # stackhpc-ipv4-geneve ssh_keypair_name = "slurm-app-ci" ssh_private_key_file = "~/.ssh/id_rsa" From e5496cf5c6b58daddd3f82426392fbb4b832ea1f Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 19 Aug 2024 12:33:02 +0000 Subject: [PATCH 07/15] bump fatimage --- environments/.stackhpc/terraform/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environments/.stackhpc/terraform/main.tf b/environments/.stackhpc/terraform/main.tf index ac588930c..1ba8ab9fd 100644 --- a/environments/.stackhpc/terraform/main.tf +++ b/environments/.stackhpc/terraform/main.tf @@ -29,9 +29,9 @@ variable "cluster_image" { description = "single image for all cluster nodes, keyed by os_version - a convenience for CI" type = map(string) default = { - # https://github.com/stackhpc/ansible-slurm-appliance/pull/413 - RL8: "openhpc-RL8-240813-1317-1b370a36" - RL9: "openhpc-ofed-RL9-240813-1317-1b370a36" + # https://github.com/stackhpc/ansible-slurm-appliance/pull/426 + RL8: "openhpc-RL8-240819-1036-4f357241" + RL9: "openhpc-ofed-RL9-240819-1036-4f357241" } } From 6846cffb561c59cdf39a904ba7082ff1fabcaa25 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 22 Aug 2024 09:31:18 +0000 Subject: [PATCH 08/15] update packer common vars --- environments/.stackhpc/ARCUS.pkrvars.hcl | 3 --- environments/.stackhpc/LEAFCLOUD.pkrvars.hcl | 3 --- environments/.stackhpc/SMS.pkrvars.hcl | 3 --- packer/openstack.pkr.hcl | 6 +++--- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/environments/.stackhpc/ARCUS.pkrvars.hcl b/environments/.stackhpc/ARCUS.pkrvars.hcl index c07717156..6fd80e7a6 100644 --- a/environments/.stackhpc/ARCUS.pkrvars.hcl +++ b/environments/.stackhpc/ARCUS.pkrvars.hcl @@ -1,7 +1,4 @@ flavor = "vm.ska.cpu.general.small" -use_blockstorage_volume = true -volume_size = 15 # GB -image_disk_format = "qcow2" networks = ["4b6b2722-ee5b-40ec-8e52-a6610e14cc51"] # portal-internal (DNS broken on ilab-60) ssh_keypair_name = "slurm-app-ci" ssh_private_key_file = "~/.ssh/id_rsa" diff --git a/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl index da2d96d38..5adf4199c 100644 --- a/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl +++ b/environments/.stackhpc/LEAFCLOUD.pkrvars.hcl @@ -1,8 +1,5 @@ flavor = "ec1.large" -use_blockstorage_volume = true -volume_size = 15 # GB volume_type = "unencrypted" -image_disk_format = "qcow2" networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci ssh_keypair_name = "slurm-app-ci" ssh_private_key_file = "~/.ssh/id_rsa" diff --git a/environments/.stackhpc/SMS.pkrvars.hcl b/environments/.stackhpc/SMS.pkrvars.hcl index e78994878..b88106fe8 100644 --- a/environments/.stackhpc/SMS.pkrvars.hcl +++ b/environments/.stackhpc/SMS.pkrvars.hcl @@ -1,7 +1,4 @@ flavor = "general.v1.small" -use_blockstorage_volume = true -volume_size = 15 # GB -image_disk_format = "qcow2" networks = ["e2b9e59f-43da-4e1c-b558-dc9da4c0d738"] # stackhpc-ipv4-geneve 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 bb6af1a38..6c5609e2b 100644 --- a/packer/openstack.pkr.hcl +++ b/packer/openstack.pkr.hcl @@ -120,7 +120,7 @@ variable "manifest_output_path" { variable "use_blockstorage_volume" { type = bool - default = false + default = true } variable "volume_type" { @@ -130,12 +130,12 @@ variable "volume_type" { variable "volume_size" { type = number - default = null # When not specified use the size of the builder instance root disk + default = 15 } variable "image_disk_format" { type = string - default = null # When not specified use the image default + default = qcow2 } variable "metadata" { From acf08ce134614ef081e9ef5e8e83f2d456b57ff1 Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:16:52 +0100 Subject: [PATCH 09/15] Update fatimage.yml --- .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 68d3f4315..fdad7c2f0 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -5,8 +5,9 @@ name: Build fat image inputs: ci_cloud: description: 'Select the CI_CLOUD' - required: true + required: false type: choice + default: ${{ vars.CI_CLOUD }} options: - LEAFCLOUD - ARCUS From b7b00d81dd4ee6f7bb505d52736c2eecfb263f8b Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:20:11 +0100 Subject: [PATCH 10/15] Update main.tf images --- environments/.stackhpc/terraform/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environments/.stackhpc/terraform/main.tf b/environments/.stackhpc/terraform/main.tf index 1ba8ab9fd..ac588930c 100644 --- a/environments/.stackhpc/terraform/main.tf +++ b/environments/.stackhpc/terraform/main.tf @@ -29,9 +29,9 @@ variable "cluster_image" { description = "single image for all cluster nodes, keyed by os_version - a convenience for CI" type = map(string) default = { - # https://github.com/stackhpc/ansible-slurm-appliance/pull/426 - RL8: "openhpc-RL8-240819-1036-4f357241" - RL9: "openhpc-ofed-RL9-240819-1036-4f357241" + # https://github.com/stackhpc/ansible-slurm-appliance/pull/413 + RL8: "openhpc-RL8-240813-1317-1b370a36" + RL9: "openhpc-ofed-RL9-240813-1317-1b370a36" } } From eb88d4b73f2e5b21bddadcba90542330993fe4cc Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:40:42 +0100 Subject: [PATCH 11/15] Update fatimage.yml --- .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 fdad7c2f0..b0bc6d31c 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -6,7 +6,7 @@ name: Build fat image ci_cloud: description: 'Select the CI_CLOUD' required: false - type: choice + type: string default: ${{ vars.CI_CLOUD }} options: - LEAFCLOUD From 143c5033c0eded871f58d5e7ce5472e4c0e33e7b Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:53:18 +0100 Subject: [PATCH 12/15] revert fatimage.yml changes --- .github/workflows/fatimage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index b0bc6d31c..f68d6b26d 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -5,13 +5,13 @@ name: Build fat image inputs: ci_cloud: description: 'Select the CI_CLOUD' - required: false - type: string + required: true + type: choice default: ${{ vars.CI_CLOUD }} options: - - LEAFCLOUD - ARCUS - SMS + - LEAFCLOUD concurrency: group: ${{ github.ref }}-{{ matrix.os_version }}-{{ matrix.build }} # to branch/PR + OS + build cancel-in-progress: true From 70c00422716f0ef1c4d9d7ffbf498aaededec659 Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:07:37 +0100 Subject: [PATCH 13/15] Update fatimage.yml --- .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 f68d6b26d..f43458d1f 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -5,7 +5,7 @@ name: Build fat image inputs: ci_cloud: description: 'Select the CI_CLOUD' - required: true + required: false type: choice default: ${{ vars.CI_CLOUD }} options: From bc1721a3aed05e6cd056a3e9845f9a0730dacc90 Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:31:10 +0100 Subject: [PATCH 14/15] Update fatimage.yml --- .github/workflows/fatimage.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index f43458d1f..c155850e8 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -5,13 +5,12 @@ name: Build fat image inputs: ci_cloud: description: 'Select the CI_CLOUD' - required: false + required: true type: choice - default: ${{ vars.CI_CLOUD }} options: - - ARCUS - - SMS - LEAFCLOUD + - SMS + - ARCUS concurrency: group: ${{ github.ref }}-{{ matrix.os_version }}-{{ matrix.build }} # to branch/PR + OS + build cancel-in-progress: true From a0fb65d549b09cf8e870d72b684d90e2c8e1b599 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Wed, 4 Sep 2024 11:17:52 +0000 Subject: [PATCH 15/15] hcl packer var put string in quotes --- 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 6c5609e2b..a247ef37d 100644 --- a/packer/openstack.pkr.hcl +++ b/packer/openstack.pkr.hcl @@ -135,7 +135,7 @@ variable "volume_size" { variable "image_disk_format" { type = string - default = qcow2 + default = "qcow2" } variable "metadata" {