Skip to content

Commit f67c1ab

Browse files
Alex-WelshAlex-Welsh
committed
Merge remote-tracking branch 'origin/stackhpc/master' into 2025.1-init
2 parents 6e720be + 83e67f2 commit f67c1ab

File tree

96 files changed

+481
-2057
lines changed

Some content is hidden

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

96 files changed

+481
-2057
lines changed

‎.github/workflows/ipa-image-build.yml

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
description: Build Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Build Ubuntu 22.04 Jammy
12-
type: boolean
13-
default: true
1410
ubuntu-noble:
1511
description: Build Ubuntu 24.04 Noble
1612
type: boolean
@@ -216,65 +212,6 @@ jobs:
216212
env:
217213
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
218214

219-
- name: Build a Ubuntu 22.04 Jammy IPA image
220-
id: build_ubuntu_jammy_ipa
221-
continue-on-error: true
222-
run: |
223-
source venvs/kayobe/bin/activate &&
224-
source src/kayobe-config/kayobe-env --environment ci-builder &&
225-
kayobe overcloud deployment image build --force-rebuild \
226-
-e os_distribution="ubuntu" \
227-
-e os_release="jammy" \
228-
-e ipa_ci_builder_distribution="ubuntu" \
229-
-e ipa_ci_builder_release="jammy"
230-
env:
231-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
232-
if: inputs.ubuntu-jammy
233-
234-
- name: Show last error logs
235-
continue-on-error: true
236-
run: |
237-
source venvs/kayobe/bin/activate &&
238-
source src/kayobe-config/kayobe-env --environment ci-builder &&
239-
kayobe seed host command run --command "tail -200 /opt/kayobe/images/ipa/ipa.stdout" --show-output
240-
env:
241-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
242-
if: steps.build_ubuntu_jammy_ipa.outcome == 'failure'
243-
244-
- name: Upload Ubuntu 22.04 Jammy IPA kernel image to Ark
245-
run: |
246-
source venvs/kayobe/bin/activate &&
247-
source src/kayobe-config/kayobe-env --environment ci-builder &&
248-
kayobe playbook run \
249-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
250-
-e artifact_path=/opt/kayobe/images/ipa \
251-
-e artifact_type=ipa-images \
252-
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
253-
-e os_distribution="ubuntu" \
254-
-e os_release="jammy" \
255-
-e file_regex='*.kernel' \
256-
-e upload_checksum=true
257-
env:
258-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
259-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy_ipa.outcome == 'success'
260-
261-
- name: Upload Ubuntu 22.04 Jammy IPA ramdisk image to Ark
262-
run: |
263-
source venvs/kayobe/bin/activate &&
264-
source src/kayobe-config/kayobe-env --environment ci-builder &&
265-
kayobe playbook run \
266-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
267-
-e artifact_path=/opt/kayobe/images/ipa \
268-
-e artifact_type=ipa-images \
269-
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
270-
-e os_distribution="ubuntu" \
271-
-e os_release="jammy" \
272-
-e file_regex='*.initramfs' \
273-
-e upload_checksum=true
274-
env:
275-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
276-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy_ipa.outcome == 'success'
277-
278215
- name: Build a Ubuntu 24.04 Noble IPA image
279216
id: build_ubuntu_noble_ipa
280217
continue-on-error: true
@@ -411,7 +348,6 @@ jobs:
411348
echo "Builds failed. See workflow artifacts for details." &&
412349
exit 1
413350
if: steps.build_rocky_9_ipa.outcome == 'failure' ||
414-
steps.build_ubuntu_jammy_ipa.outcome == 'failure' ||
415351
steps.build_ubuntu_noble_ipa.outcome == 'failure'
416352

417353
- name: Destroy

‎.github/workflows/ipa-image-promote.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
description: Promote Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Promote Ubuntu 22.04 Jammy
12-
type: boolean
13-
default: true
1410
ubuntu-noble:
1511
description: Promote Ubuntu 24.04 Noble
1612
type: boolean
@@ -25,11 +21,11 @@ jobs:
2521
ipa-image-promote:
2622
name: Promote IPA image
2723
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
28-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-latest
2925
steps:
3026
- name: Validate inputs
3127
run: |
32-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
28+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
3329
echo "At least one distribution must be selected"
3430
exit 1
3531
fi
@@ -89,20 +85,6 @@ jobs:
8985
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
9086
if: inputs.rocky9
9187

92-
- name: Promote Ubuntu Jammy 22.04 IPA image artifact
93-
run: |
94-
source venvs/kayobe/bin/activate &&
95-
source src/kayobe-config/kayobe-env --environment ci-builder &&
96-
kayobe playbook run \
97-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
98-
-e artifact_type="ipa-images" \
99-
-e os_distribution='ubuntu' \
100-
-e os_release='jammy'
101-
env:
102-
ARTIFACT_TAG: ${{ inputs.image_tag }}
103-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
104-
if: inputs.ubuntu-jammy
105-
10688
- name: Promote Ubuntu Noble 24.04 IPA image artifact
10789
run: |
10890
source venvs/kayobe/bin/activate &&

‎.github/workflows/multinode-inputs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ class Scenario:
3434
UBUNTU_NOBLE = OSRelease("ubuntu", "noble", "ubuntu")
3535
# NOTE(upgrade): Add supported releases here.
3636
OPENSTACK_RELEASES = [
37-
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
3837
OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
39-
OpenStackRelease("master", "2024.1", [ROCKY_9, UBUNTU_NOBLE])
38+
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
39+
OpenStackRelease("2025.1", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
4040
]
4141
NEUTRON_PLUGINS = ["ovs", "ovn"]
4242

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

Lines changed: 2 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
description: Build Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Build Ubuntu 22.04 Jammy
12-
type: boolean
13-
default: true
1410
ubuntu-noble:
1511
description: Build Ubuntu 24.04 Noble
1612
type: boolean
@@ -52,7 +48,7 @@ jobs:
5248
steps:
5349
- name: Validate inputs
5450
run: |
55-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
51+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
5652
echo "At least one distribution must be selected"
5753
exit 1
5854
fi
@@ -125,7 +121,7 @@ jobs:
125121
ssh_public_key = "id_rsa.pub"
126122
ssh_username = "ubuntu"
127123
aio_vm_name = "skc-host-image-builder"
128-
# Must be an Ubuntu Jammy host to successfully build all images
124+
# Must be an Ubuntu Noble host to successfully build all images
129125
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
130126
aio_vm_image = "${{ vars.HOST_IMAGE_BUILD_IMAGE }}"
131127
aio_vm_flavor = "${{ vars.HOST_IMAGE_BUILD_FLAVOR }}"
@@ -296,74 +292,6 @@ jobs:
296292
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
297293
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
298294

299-
- name: Build an Ubuntu Jammy 22.04 overcloud host image
300-
id: build_ubuntu_jammy
301-
continue-on-error: true
302-
run: |
303-
source venvs/kayobe/bin/activate &&
304-
source src/kayobe-config/kayobe-env --environment ci-builder &&
305-
kayobe overcloud host image build --force-rebuild \
306-
-e os_distribution="ubuntu" \
307-
-e os_release="jammy" \
308-
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-jammy
309-
env:
310-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
311-
if: inputs.ubuntu-jammy
312-
313-
- name: Show last error logs
314-
continue-on-error: true
315-
run: |
316-
source venvs/kayobe/bin/activate &&
317-
source src/kayobe-config/kayobe-env --environment ci-builder &&
318-
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.stdout" --show-output
319-
env:
320-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
321-
if: steps.build_ubuntu_jammy.outcome == 'failure'
322-
323-
- name: Upload Ubuntu Jammy 22.04 overcloud host image to Ark
324-
run: |
325-
source venvs/kayobe/bin/activate &&
326-
source src/kayobe-config/kayobe-env --environment ci-builder &&
327-
kayobe playbook run \
328-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
329-
-e artifact_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
330-
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
331-
-e artifact_type="kayobe-images" \
332-
-e file_regex="*.qcow2" \
333-
-e os_distribution="ubuntu" \
334-
-e os_release="jammy"
335-
env:
336-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
337-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
338-
339-
- name: Upload Ubuntu Jammy overcloud host image to current Dev Cloud (SMS/Leafcloud)
340-
run: |
341-
source venvs/kayobe/bin/activate &&
342-
source src/kayobe-config/kayobe-env --environment ci-builder &&
343-
kayobe playbook run \
344-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
345-
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
346-
-e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
347-
env:
348-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
349-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
350-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
351-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
352-
353-
- name: Upload Ubuntu Jammy overcloud host image to other Dev Cloud (Leafcloud/SMS)
354-
run: |
355-
source venvs/kayobe/bin/activate &&
356-
source src/kayobe-config/kayobe-env --environment ci-builder &&
357-
kayobe playbook run \
358-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
359-
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
360-
-e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
361-
env:
362-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_OTHER_CLOUD }}
363-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_OTHER_CLOUD }}
364-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
365-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
366-
367295
- name: Build an Ubuntu Noble 24.04 overcloud host image
368296
id: build_ubuntu_noble
369297
continue-on-error: true
@@ -432,7 +360,6 @@ jobs:
432360
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_OTHER_CLOUD }}
433361
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
434362

435-
436363
- name: Copy logs back
437364
continue-on-error: true
438365
run: |
@@ -446,7 +373,6 @@ jobs:
446373
echo "Builds failed. See workflow artifacts for details." &&
447374
exit 1
448375
if: steps.build_rocky_9.outcome == 'failure' ||
449-
steps.build_ubuntu_jammy.outcome == 'failure' ||
450376
steps.build_ubuntu_noble.outcome == 'failure'
451377

452378
- name: Upload logs artifact

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
description: Promote Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Promote Ubuntu 22.04 Jammy
12-
type: boolean
13-
default: true
1410
ubuntu-noble:
1511
description: Promote Ubuntu 24.04 Noble
1612
type: boolean
@@ -25,11 +21,11 @@ jobs:
2521
overcloud-host-image-promote:
2622
name: Promote overcloud host image
2723
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
28-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2925
steps:
3026
- name: Validate inputs
3127
run: |
32-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
28+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
3329
echo "At least one distribution must be selected"
3430
exit 1
3531
fi
@@ -89,20 +85,6 @@ jobs:
8985
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
9086
if: inputs.rocky9
9187

92-
- name: Promote Ubuntu Jammy 22.04 overcloud host image artifact
93-
run: |
94-
source venvs/kayobe/bin/activate &&
95-
source src/kayobe-config/kayobe-env --environment ci-builder &&
96-
kayobe playbook run \
97-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
98-
-e artifact_type="kayobe-images" \
99-
-e os_distribution='ubuntu' \
100-
-e os_release='jammy'
101-
env:
102-
ARTIFACT_TAG: ${{ inputs.image_tag }}
103-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
104-
if: inputs.ubuntu-jammy
105-
10688
- name: Promote Ubuntu Noble 24.04 overcloud host image artifact
10789
run: |
10890
source venvs/kayobe/bin/activate &&

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

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
description: Upload Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Upload Ubuntu 22.04 Jammy
12-
type: boolean
13-
default: true
1410
ubuntu-noble:
1511
description: Upload Ubuntu 24.04 Noble
1612
type: boolean
@@ -54,7 +50,7 @@ jobs:
5450
steps:
5551
- name: Validate inputs
5652
run: |
57-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
53+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
5854
echo "At least one distribution must be selected"
5955
exit 1
6056
fi
@@ -145,51 +141,6 @@ jobs:
145141
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
146142
if: inputs.rocky9 && steps.rocky_9_image_exists.outcome == 'failure'
147143

148-
- name: Output Ubuntu Jammy image tag
149-
id: ubuntu_jammy_image_tag
150-
run: |
151-
echo image_tag=$(grep stackhpc_ubuntu_jammy_overcloud_host_image_version: src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
152-
153-
- name: Check if image exists already
154-
id: ubuntu_jammy_image_exists
155-
run: |
156-
source venvs/kayobe/bin/activate &&
157-
openstack image show \
158-
overcloud-ubuntu-jammy-${{ steps.ubuntu_jammy_image_tag.outputs.image_tag }}
159-
env:
160-
OS_CLOUD: openstack
161-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
162-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
163-
continue-on-error: true
164-
165-
- name: Download Ubuntu Jammy 22.04 overcloud host image from Ark
166-
run: |
167-
source venvs/kayobe/bin/activate &&
168-
source src/kayobe-config/kayobe-env --environment ${{ inputs.kayobe-environment }} &&
169-
kayobe playbook run \
170-
src/kayobe-config/etc/kayobe/ansible/pulp-host-image-download.yml \
171-
-e os_distribution="ubuntu" \
172-
-e os_release="jammy"
173-
env:
174-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
175-
if: inputs.ubuntu-jammy && steps.ubuntu_jammy_image_exists.outcome == 'failure'
176-
177-
- name: Upload Ubuntu Jammy 22.04 overcloud host image to Cloud
178-
run: |
179-
source venvs/kayobe/bin/activate &&
180-
openstack image create \
181-
overcloud-ubuntu-jammy-${{ steps.ubuntu_jammy_image_tag.outputs.image_tag }} \
182-
--container-format bare \
183-
--disk-format qcow2 \
184-
--file /tmp/ubuntu-jammy.qcow2 \
185-
--private \
186-
--progress
187-
env:
188-
OS_CLOUD: openstack
189-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
190-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
191-
if: inputs.ubuntu-jammy && steps.ubuntu_jammy_image_exists.outcome == 'failure'
192-
193144
- name: Output Ubuntu Noble image tag
194145
id: ubuntu_noble_image_tag
195146
run: |

0 commit comments

Comments
 (0)