Skip to content

Commit 161fbd7

Browse files
Alex-WelshAlex-Welsh
committed
Merge branch 'stackhpc/2024.1' into 2024.1-ansible-lint-alex
2 parents 235b1c3 + 385671d commit 161fbd7

File tree

84 files changed

+2434
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2434
-75
lines changed

‎.automation

‎.automation.conf/config.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33

44
# See: https://github.com/stackhpc/docker-rally/blob/master/bin/rally-verify-wrapper.sh for a full list of tempest parameters that can be overriden.
55
# You can override tempest parameters like so:
6-
export TEMPEST_CONCURRENCY=2
6+
7+
# The Tempest concurrency determines how many tests can be running at once.
8+
# Higher values run tests faster but risk running out of resources and failing tests
9+
# On production systems, Tempest concurrency can usually be set to a high number e.g. 16-64. It is often limited by the number of available floating IPs.
10+
# On virtualised test environments, compute and networking speeds often limit the concurrency to 1-16 before tests begin to fail due to timeouts.
11+
export TEMPEST_CONCURRENCY=16
12+
13+
714
# Specify single test whilst experimenting
815
#export TEMPEST_PATTERN="${TEMPEST_PATTERN:-tempest.api.compute.servers.test_create_server.ServersTestJSON.test_host_name_is_same_as_server_name}"
916

@@ -21,9 +28,7 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then
2128
fi
2229

2330
if [[ "$KAYOBE_ENVIRONMENT" =~ "ci-multinode" ]]; then
24-
# SMSLab is currently running with 1G switches. This causes tests using volumes and images to fail if
25-
# the concurrency is set too high.
26-
export TEMPEST_CONCURRENCY=1
31+
export TEMPEST_CONCURRENCY=4
2732
# Uncomment this to perform a full tempest test
2833
# export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
2934
# export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode-tempest-full

‎.automation.conf/run-books/pulp-sync-content.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
3+
set -euE
4+
set -o pipefail
5+
6+
PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7+
KAYOBE_AUTOMATION_DIR="$(realpath "${PARENT}/../../.automation")"
8+
9+
function main {
10+
if [ "${PULP_DO_CONTAINER_SYNC:-}" = true ]; then
11+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-container-sync.yml' -e stackhpc_pulp_images_kolla_filter="${PULP_KOLLA_FILTER:-}"
12+
fi
13+
if [ "${PULP_DO_CONTAINER_PUBLISH:-}" = true ]; then
14+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-container-publish.yml' -e stackhpc_pulp_images_kolla_filter="${PULP_KOLLA_FILTER:-}"
15+
fi
16+
if [ "${PULP_DO_REPO_SYNC:-}" = true ]; then
17+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-sync.yml'
18+
fi
19+
if [ "${PULP_DO_REPO_PUBLISH:-}" = true ]; then
20+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-publish.yml'
21+
fi
22+
if [ "${PULP_DO_REPO_PROMOTE:-}" = true ]; then
23+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-promote-production.yml'
24+
fi
25+
}
26+
27+
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
28+
main
29+
fi

‎.github/workflows/overcloud-host-image-build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ jobs:
3232
runs-on: arc-skc-host-image-builder-runner
3333
permissions: {}
3434
steps:
35+
- name: Validate inputs
36+
run: |
37+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
38+
echo "At least one distribution must be selected"
39+
exit 1
40+
fi
41+
3542
- name: Install Package
3643
uses: ConorMacBride/install-package@main
3744
with:

‎.github/workflows/overcloud-host-image-promote.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ jobs:
2323
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
2424
runs-on: ubuntu-22.04
2525
steps:
26+
- name: Validate inputs
27+
run: |
28+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
29+
echo "At least one distribution must be selected"
30+
exit 1
31+
fi
32+
2633
- uses: actions/checkout@v4
2734
with:
2835
path: src/kayobe-config

‎.github/workflows/overcloud-host-image-upload.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ jobs:
3434
runs-on: arc-skc-host-image-builder-runner
3535
permissions: {}
3636
steps:
37+
- name: Validate inputs
38+
run: |
39+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
40+
echo "At least one distribution must be selected"
41+
exit 1
42+
fi
43+
3744
- name: Install package dependencies
3845
run: |
3946
sudo apt update

‎.github/workflows/package-build-ofed.yml

Lines changed: 254 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,254 @@
1+
---
2+
name: Build OFED packages
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
rocky9:
7+
description: Build Rocky Linux 9
8+
type: boolean
9+
default: true
10+
secrets:
11+
KAYOBE_VAULT_PASSWORD:
12+
required: true
13+
CLOUDS_YAML:
14+
required: true
15+
OS_APPLICATION_CREDENTIAL_ID:
16+
required: true
17+
OS_APPLICATION_CREDENTIAL_SECRET:
18+
required: true
19+
20+
env:
21+
ANSIBLE_FORCE_COLOR: True
22+
KAYOBE_ENVIRONMENT: ci-builder
23+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
24+
jobs:
25+
overcloud-ofed-packages:
26+
name: Build OFED packages
27+
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
28+
runs-on: arc-skc-host-image-builder-runner
29+
permissions: {}
30+
steps:
31+
- name: Install Package
32+
uses: ConorMacBride/install-package@main
33+
with:
34+
apt: git unzip nodejs python3-pip python3-venv openssh-server openssh-client jq
35+
36+
- name: Start the SSH service
37+
run: |
38+
sudo /etc/init.d/ssh start
39+
40+
- name: Checkout
41+
uses: actions/checkout@v4
42+
with:
43+
path: src/kayobe-config
44+
45+
- name: Determine OpenStack release
46+
id: openstack_release
47+
run: |
48+
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
49+
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
50+
51+
- name: Clone StackHPC Kayobe repository
52+
uses: actions/checkout@v4
53+
with:
54+
repository: stackhpc/kayobe
55+
ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}
56+
path: src/kayobe
57+
58+
- name: Install Kayobe
59+
run: |
60+
mkdir -p venvs &&
61+
pushd venvs &&
62+
python3 -m venv kayobe &&
63+
source kayobe/bin/activate &&
64+
pip install -U pip &&
65+
pip install ../src/kayobe
66+
67+
- name: Install terraform
68+
uses: hashicorp/setup-terraform@v2
69+
70+
- name: Initialise terraform
71+
run: terraform init
72+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
73+
74+
- name: Generate SSH keypair
75+
run: ssh-keygen -f id_rsa -N ''
76+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
77+
78+
- name: Generate clouds.yaml
79+
run: |
80+
cat << EOF > clouds.yaml
81+
${{ secrets.CLOUDS_YAML }}
82+
EOF
83+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
84+
85+
- name: Output image tag
86+
id: image_tag
87+
run: |
88+
echo image_tag=$(grep stackhpc_rocky_9_overcloud_host_image_version: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
89+
90+
# Use the image override if set, otherwise use overcloud-os_distribution-os_release-tag
91+
- name: Output image name
92+
id: image_name
93+
run: |
94+
echo image_name=overcloud-rocky-9-${{ steps.image_tag.outputs.image_tag }} >> $GITHUB_OUTPUT
95+
96+
- name: Generate terraform.tfvars
97+
run: |
98+
cat << EOF > terraform.tfvars
99+
ssh_public_key = "id_rsa.pub"
100+
ssh_username = "cloud-user"
101+
aio_vm_name = "skc-ofed-builder"
102+
aio_vm_image = "${{ env.VM_IMAGE }}"
103+
aio_vm_flavor = "en1.medium"
104+
aio_vm_network = "stackhpc-ci"
105+
aio_vm_subnet = "stackhpc-ci"
106+
aio_vm_interface = "ens3"
107+
EOF
108+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
109+
env:
110+
VM_IMAGE: ${{ steps.image_name.outputs.image_name }}
111+
112+
- name: Terraform Plan
113+
run: terraform plan
114+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
115+
env:
116+
OS_CLOUD: "openstack"
117+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
118+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
119+
120+
- name: Terraform Apply
121+
run: |
122+
for attempt in $(seq 5); do
123+
if terraform apply -auto-approve; then
124+
echo "Created infrastructure on attempt $attempt"
125+
exit 0
126+
fi
127+
echo "Failed to create infrastructure on attempt $attempt"
128+
sleep 10
129+
terraform destroy -auto-approve
130+
sleep 60
131+
done
132+
echo "Failed to create infrastructure after $attempt attempts"
133+
exit 1
134+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
135+
env:
136+
OS_CLOUD: "openstack"
137+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
138+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
139+
140+
- name: Get Terraform outputs
141+
id: tf_outputs
142+
run: |
143+
terraform output -json
144+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
145+
146+
- name: Write Terraform outputs
147+
run: |
148+
cat << EOF > src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml
149+
${{ steps.tf_outputs.outputs.stdout }}
150+
EOF
151+
152+
- name: Write Terraform network config
153+
run: |
154+
cat << EOF > src/kayobe-config/etc/kayobe/environments/ci-builder/tf-network-allocation.yml
155+
---
156+
aio_ips:
157+
builder: "{{ access_ip_v4.value }}"
158+
EOF
159+
160+
- name: Write Terraform network interface config
161+
run: |
162+
mkdir -p src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed
163+
rm -f src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/network-interfaces
164+
cat << EOF > src/kayobe-config/etc/kayobe/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/seed/network-interfaces
165+
admin_interface: "{{ access_interface.value }}"
166+
aio_interface: "{{ access_interface.value }}"
167+
EOF
168+
169+
- name: Manage SSH keys
170+
run: |
171+
mkdir -p ~/.ssh
172+
touch ~/.ssh/authorized_keys
173+
cat src/kayobe-config/terraform/aio/id_rsa.pub >> ~/.ssh/authorized_keys
174+
cp src/kayobe-config/terraform/aio/id_rsa* ~/.ssh/
175+
176+
- name: Bootstrap the control host
177+
run: |
178+
source venvs/kayobe/bin/activate &&
179+
source src/kayobe-config/kayobe-env --environment ci-builder &&
180+
kayobe control host bootstrap
181+
182+
- name: Run growroot playbook
183+
run: |
184+
source venvs/kayobe/bin/activate &&
185+
source src/kayobe-config/kayobe-env --environment ci-builder &&
186+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/growroot.yml
187+
env:
188+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
189+
190+
- name: Configure the seed host (Builder VM)
191+
run: |
192+
source venvs/kayobe/bin/activate &&
193+
source src/kayobe-config/kayobe-env --environment ci-builder &&
194+
kayobe seed host configure --skip-tags network,docker
195+
env:
196+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
197+
198+
- name: Run a distro-sync
199+
run: |
200+
source venvs/kayobe/bin/activate &&
201+
source src/kayobe-config/kayobe-env --environment ci-builder &&
202+
kayobe seed host command run --become --command "dnf distro-sync --refresh"
203+
env:
204+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
205+
206+
- name: Reset BLS entries on the seed host
207+
run: |
208+
source venvs/kayobe/bin/activate &&
209+
source src/kayobe-config/kayobe-env --environment ci-builder &&
210+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/reset-bls-entries.yml \
211+
-e "reset_bls_host=ofed-builder"
212+
env:
213+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
214+
215+
- name: Disable noexec in /var/tmp
216+
run: |
217+
source venvs/kayobe/bin/activate &&
218+
source src/kayobe-config/kayobe-env --environment ci-builder &&
219+
kayobe seed host command run --become --command "sed -i 's/noexec,//g' /etc/fstab"
220+
env:
221+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
222+
223+
- name: Reboot to apply the kernel update
224+
run: |
225+
source venvs/kayobe/bin/activate &&
226+
source src/kayobe-config/kayobe-env --environment ci-builder &&
227+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/reboot.yml
228+
env:
229+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
230+
231+
- name: Run OFED builder playbook
232+
run: |
233+
source venvs/kayobe/bin/activate &&
234+
source src/kayobe-config/kayobe-env --environment ci-builder &&
235+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/build-ofed-rocky.yml
236+
env:
237+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
238+
239+
- name: Run OFED upload playbook
240+
run: |
241+
source venvs/kayobe/bin/activate &&
242+
source src/kayobe-config/kayobe-env --environment ci-builder &&
243+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/push-ofed.yml
244+
env:
245+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
246+
247+
- name: Destroy
248+
run: terraform destroy -auto-approve
249+
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
250+
env:
251+
OS_CLOUD: openstack
252+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
253+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
254+
if: always()

‎.github/workflows/stackhpc-all-in-one.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: Install Package
8989
uses: ConorMacBride/install-package@main
9090
with:
91-
apt: git unzip nodejs
91+
apt: git unzip nodejs openssh-client
9292

9393
# If testing upgrade, checkout previous release, otherwise checkout current branch
9494
- name: Checkout ${{ inputs.upgrade && 'previous release' || 'current' }} config
@@ -167,7 +167,7 @@ jobs:
167167
VM_NETWORK: ${{ inputs.vm_network }}
168168
VM_SUBNET: ${{ inputs.vm_subnet }}
169169
VM_INTERFACE: ${{ inputs.vm_interface }}
170-
VM_VOLUME_SIZE: ${{ inputs.upgrade && '55' || '40' }}
170+
VM_VOLUME_SIZE: ${{ inputs.upgrade && '65' || '50' }}
171171
VM_TAGS: '["skc-ci-aio", "PR=${{ github.event.number }}"]'
172172

173173
- name: Terraform Plan
@@ -223,6 +223,7 @@ jobs:
223223
admin_bootproto: dhcp
224224
admin_ips:
225225
controller0: "{{ access_ip_v4.value }}"
226+
admin_zone: admin
226227
EOF
227228
228229
- name: Write Terraform network interface config
@@ -443,7 +444,7 @@ jobs:
443444
-v $(pwd)/tempest-artifacts:/stack/tempest-artifacts \
444445
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
445446
$KAYOBE_IMAGE \
446-
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/tempest.sh -e ansible_user=stack -e rally_no_sensitive_log=false
447+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/tempest.sh -e ansible_user=stack
447448
env:
448449
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
449450

0 commit comments

Comments
 (0)