Skip to content

Commit cabdd99

Browse files
bertiethorpesjpb
authored and
MaxBed4d
committed
Enable SMS Labs for CI (#426)
* configure SMS deployment * add slurm-app-ci user * bastion config * allow overriding CI_CLOUD for PRs using label * choose cloud for fatimage workflow_dispatch * packer build qcows * bump fatimage * update packer common vars * Update fatimage.yml * Update main.tf images * Update fatimage.yml * revert fatimage.yml changes * Update fatimage.yml * Update fatimage.yml * hcl packer var put string in quotes --------- Co-authored-by: Steve Brasier <[email protected]>
1 parent 1c78e5b commit cabdd99

File tree

6 files changed

+56
-12
lines changed

6 files changed

+56
-12
lines changed

‎.github/workflows/fatimage.yml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
name: Build fat image
33
on:
44
workflow_dispatch:
5+
inputs:
6+
ci_cloud:
7+
description: 'Select the CI_CLOUD'
8+
required: true
9+
type: choice
10+
options:
11+
- LEAFCLOUD
12+
- SMS
13+
- ARCUS
514
jobs:
615
openstack:
716
name: openstack-imagebuild
@@ -24,15 +33,19 @@ jobs:
2433
env:
2534
ANSIBLE_FORCE_COLOR: True
2635
OS_CLOUD: openstack
27-
CI_CLOUD: ${{ vars.CI_CLOUD }}
36+
CI_CLOUD: ${{ github.event.inputs.ci_cloud }}
2837
steps:
2938
- uses: actions/checkout@v2
3039

40+
- name: Record settings for CI cloud
41+
run: |
42+
echo CI_CLOUD: ${{ env.CI_CLOUD }}
43+
3144
- name: Setup ssh
3245
run: |
3346
set -x
3447
mkdir ~/.ssh
35-
echo "${{ secrets[format('{0}_SSH_KEY', vars.CI_CLOUD)] }}" > ~/.ssh/id_rsa
48+
echo "${{ secrets[format('{0}_SSH_KEY', env.CI_CLOUD)] }}" > ~/.ssh/id_rsa
3649
chmod 0600 ~/.ssh/id_rsa
3750
shell: bash
3851

@@ -46,7 +59,7 @@ jobs:
4659
- name: Write clouds.yaml
4760
run: |
4861
mkdir -p ~/.config/openstack/
49-
echo "${{ secrets[format('{0}_CLOUDS_YAML', vars.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
62+
echo "${{ secrets[format('{0}_CLOUDS_YAML', env.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
5063
shell: bash
5164

5265
- name: Setup environment
@@ -61,7 +74,7 @@ jobs:
6174
. environments/.stackhpc/activate
6275
cd packer/
6376
packer init .
64-
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
77+
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
6578
env:
6679
PKR_VAR_os_version: ${{ matrix.os_version }}
6780

‎.github/workflows/stackhpc.yml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,34 @@ jobs:
3737
ANSIBLE_FORCE_COLOR: True
3838
OS_CLOUD: openstack
3939
TF_VAR_cluster_name: slurmci-${{ matrix.os_version }}-${{ github.run_number }}
40-
CI_CLOUD: ${{ vars.CI_CLOUD }}
40+
CI_CLOUD: ${{ vars.CI_CLOUD }} # default from repo settings
4141
TF_VAR_os_version: ${{ matrix.os_version }}
4242
steps:
4343
- uses: actions/checkout@v2
4444

45+
- name: Override CI_CLOUD if PR label is present
46+
if: ${{ github.event_name == 'pull_request' }}
47+
run: |
48+
# Iterate over the labels
49+
labels=$(echo '${{ toJSON(github.event.pull_request.labels) }}' | jq -r '.[].name')
50+
echo $labels
51+
for label in $labels; do
52+
if [[ $label == CI_CLOUD=* ]]; then
53+
# Extract the value after 'CI_CLOUD='
54+
CI_CLOUD_OVERRIDE=${label#CI_CLOUD=}
55+
echo "CI_CLOUD=${CI_CLOUD_OVERRIDE}" >> $GITHUB_ENV
56+
fi
57+
done
58+
4559
- name: Record settings for CI cloud
4660
run: |
47-
echo CI_CLOUD: ${{ vars.CI_CLOUD }}
61+
echo CI_CLOUD: ${{ env.CI_CLOUD }}
4862
4963
- name: Setup ssh
5064
run: |
5165
set -x
5266
mkdir ~/.ssh
53-
echo "${{ secrets[format('{0}_SSH_KEY', vars.CI_CLOUD)] }}" > ~/.ssh/id_rsa
67+
echo "${{ secrets[format('{0}_SSH_KEY', env.CI_CLOUD)] }}" > ~/.ssh/id_rsa
5468
chmod 0600 ~/.ssh/id_rsa
5569
shell: bash
5670

@@ -73,7 +87,7 @@ jobs:
7387
- name: Write clouds.yaml
7488
run: |
7589
mkdir -p ~/.config/openstack/
76-
echo "${{ secrets[format('{0}_CLOUDS_YAML', vars.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
90+
echo "${{ secrets[format('{0}_CLOUDS_YAML', env.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
7791
shell: bash
7892

7993
- name: Setup environment-specific inventory/terraform inputs
@@ -91,14 +105,14 @@ jobs:
91105
. venv/bin/activate
92106
. environments/.stackhpc/activate
93107
cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
94-
terraform apply -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
108+
terraform apply -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
95109
96110
- name: Delete infrastructure if provisioning failed
97111
run: |
98112
. venv/bin/activate
99113
. environments/.stackhpc/activate
100114
cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
101-
terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
115+
terraform destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
102116
if: failure() && steps.provision_servers.outcome == 'failure'
103117

104118
- name: Configure cluster
@@ -196,7 +210,7 @@ jobs:
196210
. venv/bin/activate
197211
. environments/.stackhpc/activate
198212
cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
199-
terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
213+
terraform destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
200214
if: ${{ success() || cancelled() }}
201215

202216
# - name: Delete images

‎environments/.stackhpc/SMS.pkrvars.hcl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
flavor = "general.v1.small"
2+
networks = ["e2b9e59f-43da-4e1c-b558-dc9da4c0d738"] # stackhpc-ipv4-geneve
3+
ssh_keypair_name = "slurm-app-ci"
4+
ssh_private_key_file = "~/.ssh/id_rsa"
5+
ssh_bastion_username = "slurm-app-ci"
6+
ssh_bastion_host = "185.45.78.150"
7+
ssh_bastion_private_key_file = "~/.ssh/id_rsa"

‎environments/.stackhpc/bastion_fingerprints‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
|1|whGSPLhKW4xt/7PWOZ1treg3PtA=|F5gwV8j0JYWDzjb6DvHHaqO+sxs= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCpCG881Gt3dr+nuVIC2uGEQkeVwG6WDdS1WcCoxXC7AG+Oi5bfdqtf4IfeLpWmeuEaAaSFH48ODFr76ViygSjU=
33
|1|0V6eQ1FKO5NMKaHZeNFbw62mrJs=|H1vuGTbbtZD2MEgZxQf1PXPk+yU= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEnOtYByM3s2qvRT8SS1sn5z5sbwjzb1alm0B3emPcHJ
44
|1|u3QVAK9R2x7Z3uKNj+0vDEIekl0=|yy09Q0Kw472+J7bjFkmir28x3lE= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNuXZkH7ppkTGNGKzmGEvAnvlLO2D+YtlJw1m3P16FV
5-
|1|nOHeibGxhsIFnhW0flRwnirJjlg=|IJ8nJB355LGI+1U3Wpvdcgdf0ek= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGG6DieKAdgiTCqRmF2HD0dJi9DuORblPzbridniICsw
5+
|1|nOHeibGxhsIFnhW0flRwnirJjlg=|IJ8nJB355LGI+1U3Wpvdcgdf0ek= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGG6DieKAdgiTCqRmF2HD0dJi9DuORblPzbridniICsw
6+
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=
7+
185.45.78.150 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCB8R1BElOz4geGfCcb/ObF5n4Par+g9AaXQW5FU1ccgnPA59uJeOEALPeXAgJijVOhwqTdIkIoWYWeGdlud9Wc=
8+
185.45.78.150 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINNuXZkH7ppkTGNGKzmGEvAnvlLO2D+YtlJw1m3P16FV

‎environments/.stackhpc/inventory/group_vars/all/bastion.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ bastion_config:
66
LEAFCLOUD:
77
user: slurm-app-ci
88
ip: 195.114.30.222
9+
SMS:
10+
user: slurm-app-ci
11+
ip: 185.45.78.150
912
# NB: The bastion_{user,ip} variables are used directly in the CI workflow too
1013
bastion_user: "{{ bastion_config[ci_cloud].user }}"
1114
bastion_ip: "{{ bastion_config[ci_cloud].ip }}"

‎environments/.stackhpc/terraform/SMS.tfvars‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cluster_net = "stackhpc-ipv4-geneve"
2+
cluster_subnet = "stackhpc-ipv4-geneve-subnet"
3+
control_node_flavor = "general.v1.small"
4+
other_node_flavor = "general.v1.small"

0 commit comments

Comments
 (0)