Skip to content

Commit 857f9f0

Browse files
Alex-WelshAlex-Welsh
authored
Merge pull request #1484 from stackhpc/support-noble
Master: Find/Replace Jammy/Noble
2 parents 94a4974 + 2f929ca commit 857f9f0

32 files changed

+218
-257
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
description: Build Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Build Ubuntu 22.04 Jammy
10+
ubuntu-noble:
11+
description: Build Ubuntu 24.04 Noble
1212
type: boolean
1313
default: true
1414
secrets:
@@ -99,7 +99,7 @@ jobs:
9999
ssh_public_key = "id_rsa.pub"
100100
ssh_username = "ubuntu"
101101
aio_vm_name = "skc-ipa-image-builder"
102-
aio_vm_image = "Ubuntu-22.04"
102+
aio_vm_image = "Ubuntu-24.04"
103103
aio_vm_flavor = "en1.large"
104104
aio_vm_network = "stackhpc-ci"
105105
aio_vm_subnet = "stackhpc-ci"
@@ -197,20 +197,20 @@ jobs:
197197
env:
198198
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
199199

200-
- name: Build a Ubuntu 22.04 Jammy IPA image
201-
id: build_ubuntu_jammy_ipa
200+
- name: Build a Ubuntu 24.04 Noble IPA image
201+
id: build_ubuntu_noble_ipa
202202
continue-on-error: true
203203
run: |
204204
source venvs/kayobe/bin/activate &&
205205
source src/kayobe-config/kayobe-env --environment ci-builder &&
206206
kayobe overcloud deployment image build --force-rebuild \
207207
-e os_distribution="ubuntu" \
208-
-e os_release="jammy" \
208+
-e os_release="noble" \
209209
-e ipa_ci_builder_distribution="ubuntu" \
210-
-e ipa_ci_builder_release="jammy"
210+
-e ipa_ci_builder_release="noble"
211211
env:
212212
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
213-
if: inputs.ubuntu-jammy
213+
if: inputs.ubuntu-noble
214214

215215
- name: Show last error logs
216216
continue-on-error: true
@@ -220,9 +220,9 @@ jobs:
220220
kayobe seed host command run --command "tail -200 /opt/kayobe/images/ipa/ipa.stdout" --show-output
221221
env:
222222
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
223-
if: steps.build_ubuntu_jammy_ipa.outcome == 'failure'
223+
if: steps.build_ubuntu_noble_ipa.outcome == 'failure'
224224

225-
- name: Upload Ubuntu 22.04 Jammy IPA kernel image to Ark
225+
- name: Upload Ubuntu 24.04 Noble IPA kernel image to Ark
226226
run: |
227227
source venvs/kayobe/bin/activate &&
228228
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -232,14 +232,14 @@ jobs:
232232
-e artifact_type=ipa-images \
233233
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
234234
-e os_distribution="ubuntu" \
235-
-e os_release="jammy" \
235+
-e os_release="noble" \
236236
-e file_regex='*.kernel' \
237237
-e upload_checksum=true
238238
env:
239239
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
240-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy_ipa.outcome == 'success'
240+
if: inputs.ubuntu-noble && steps.build_ubuntu_noble_ipa.outcome == 'success'
241241

242-
- name: Upload Ubuntu 22.04 Jammy IPA ramdisk image to Ark
242+
- name: Upload Ubuntu 24.04 Noble IPA ramdisk image to Ark
243243
run: |
244244
source venvs/kayobe/bin/activate &&
245245
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -249,12 +249,12 @@ jobs:
249249
-e artifact_type=ipa-images \
250250
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
251251
-e os_distribution="ubuntu" \
252-
-e os_release="jammy" \
252+
-e os_release="noble" \
253253
-e file_regex='*.initramfs' \
254254
-e upload_checksum=true
255255
env:
256256
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
257-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy_ipa.outcome == 'success'
257+
if: inputs.ubuntu-noble && steps.build_ubuntu_noble_ipa.outcome == 'success'
258258

259259
- name: Build a Rocky 9 IPA image
260260
id: build_rocky_9_ipa
@@ -333,7 +333,7 @@ jobs:
333333
echo "Builds failed. See workflow artifacts for details." &&
334334
exit 1
335335
if: steps.build_rocky_9_ipa.outcome == 'failure' ||
336-
steps.build_ubuntu_jammy_ipa.outcome == 'failure'
336+
steps.build_ubuntu_noble_ipa.outcome == 'failure'
337337

338338
- name: Destroy
339339
run: terraform destroy -auto-approve

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
description: Promote Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Promote Ubuntu 22.04 Jammy
10+
ubuntu-noble:
11+
description: Promote Ubuntu 24.04 Noble
1212
type: boolean
1313
default: true
1414
image_tag:
@@ -21,11 +21,11 @@ jobs:
2121
ipa-image-promote:
2222
name: Promote IPA image
2323
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-latest
2525
steps:
2626
- name: Validate inputs
2727
run: |
28-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
28+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
2929
echo "At least one distribution must be selected"
3030
exit 1
3131
fi
@@ -85,16 +85,16 @@ jobs:
8585
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
8686
if: inputs.rocky9
8787

88-
- name: Promote Ubuntu Jammy 22.04 IPA image artifact
88+
- name: Promote Ubuntu Noble 24.04 IPA image artifact
8989
run: |
9090
source venvs/kayobe/bin/activate &&
9191
source src/kayobe-config/kayobe-env --environment ci-builder &&
9292
kayobe playbook run \
9393
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
9494
-e artifact_type="ipa-images" \
9595
-e os_distribution='ubuntu' \
96-
-e os_release='jammy'
96+
-e os_release='noble'
9797
env:
9898
ARTIFACT_TAG: ${{ inputs.image_tag }}
9999
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
100-
if: inputs.ubuntu-jammy
100+
if: inputs.ubuntu-noble

‎.github/workflows/multinode-inputs.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ class Scenario:
3131

3232
ROCKY_9 = OSRelease("rocky", "9", "cloud-user")
3333
UBUNTU_JAMMY = OSRelease("ubuntu", "jammy", "ubuntu")
34+
UBUNTU_NOBLE = OSRelease("ubuntu", "noble", "ubuntu")
3435
# NOTE(upgrade): Add supported releases here.
3536
OPENSTACK_RELEASES = [
36-
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
3737
OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
38+
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
39+
OpenStackRelease("master", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
3840
]
3941
NEUTRON_PLUGINS = ["ovs", "ovn"]
4042

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
description: Build Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Build Ubuntu 22.04 Jammy
10+
ubuntu-noble:
11+
description: Build Ubuntu 24.04 Noble
1212
type: boolean
1313
default: true
1414
secrets:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- name: Validate inputs
3636
run: |
37-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
37+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
3838
echo "At least one distribution must be selected"
3939
exit 1
4040
fi
@@ -107,9 +107,9 @@ jobs:
107107
ssh_public_key = "id_rsa.pub"
108108
ssh_username = "ubuntu"
109109
aio_vm_name = "skc-host-image-builder"
110-
# Must be an Ubuntu Jammy host to successfully build all images
110+
# Must be an Ubuntu Noble host to successfully build all images
111111
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
112-
aio_vm_image = "Ubuntu-22.04"
112+
aio_vm_image = "Ubuntu-24.04"
113113
aio_vm_flavor = "en1.medium"
114114
aio_vm_network = "stackhpc-ci"
115115
aio_vm_subnet = "stackhpc-ci"
@@ -264,59 +264,59 @@ jobs:
264264
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
265265
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
266266

267-
- name: Build an Ubuntu Jammy 22.04 overcloud host image
268-
id: build_ubuntu_jammy
267+
- name: Build an Ubuntu Noble 24.04 overcloud host image
268+
id: build_ubuntu_noble
269269
continue-on-error: true
270270
run: |
271271
source venvs/kayobe/bin/activate &&
272272
source src/kayobe-config/kayobe-env --environment ci-builder &&
273273
kayobe overcloud host image build --force-rebuild \
274274
-e os_distribution="ubuntu" \
275-
-e os_release="jammy" \
276-
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-jammy
275+
-e os_release="noble" \
276+
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-noble
277277
env:
278278
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
279-
if: inputs.ubuntu-jammy
279+
if: inputs.ubuntu-noble
280280

281281
- name: Show last error logs
282282
continue-on-error: true
283283
run: |
284284
source venvs/kayobe/bin/activate &&
285285
source src/kayobe-config/kayobe-env --environment ci-builder &&
286-
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.stdout" --show-output
286+
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.stdout" --show-output
287287
env:
288288
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
289-
if: steps.build_ubuntu_jammy.outcome == 'failure'
289+
if: steps.build_ubuntu_noble.outcome == 'failure'
290290

291-
- name: Upload Ubuntu Jammy 22.04 overcloud host image to Ark
291+
- name: Upload Ubuntu Noble 24.04 overcloud host image to Ark
292292
run: |
293293
source venvs/kayobe/bin/activate &&
294294
source src/kayobe-config/kayobe-env --environment ci-builder &&
295295
kayobe playbook run \
296296
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
297-
-e artifact_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
297+
-e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
298298
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
299299
-e artifact_type="kayobe-images" \
300300
-e file_regex="*.qcow2" \
301301
-e os_distribution="ubuntu" \
302-
-e os_release="jammy"
302+
-e os_release="noble"
303303
env:
304304
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
305-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
305+
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
306306

307-
- name: Upload Ubuntu Jammy overcloud host image to Dev Cloud
307+
- name: Upload Ubuntu Noble overcloud host image to Dev Cloud
308308
run: |
309309
source venvs/kayobe/bin/activate &&
310310
source src/kayobe-config/kayobe-env --environment ci-builder &&
311311
kayobe playbook run \
312312
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
313-
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
314-
-e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
313+
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
314+
-e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
315315
env:
316316
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
317317
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
318318
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
319-
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
319+
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
320320

321321
- name: Copy logs back
322322
continue-on-error: true
@@ -331,7 +331,7 @@ jobs:
331331
echo "Builds failed. See workflow artifacts for details." &&
332332
exit 1
333333
if: steps.build_rocky_9.outcome == 'failure' ||
334-
steps.build_ubuntu_jammy.outcome == 'failure'
334+
steps.build_ubuntu_noble.outcome == 'failure'
335335

336336
- name: Upload logs artifact
337337
uses: actions/upload-artifact@v4

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
description: Promote Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Promote Ubuntu 22.04 Jammy
10+
ubuntu-noble:
11+
description: Promote Ubuntu 24.04 Noble
1212
type: boolean
1313
default: true
1414
image_tag:
@@ -21,11 +21,11 @@ jobs:
2121
overcloud-host-image-promote:
2222
name: Promote overcloud host image
2323
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
steps:
2626
- name: Validate inputs
2727
run: |
28-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
28+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
2929
echo "At least one distribution must be selected"
3030
exit 1
3131
fi
@@ -85,16 +85,16 @@ jobs:
8585
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
8686
if: inputs.rocky9
8787

88-
- name: Promote Ubuntu Jammy 22.04 overcloud host image artifact
88+
- name: Promote Ubuntu Noble 24.04 overcloud host image artifact
8989
run: |
9090
source venvs/kayobe/bin/activate &&
9191
source src/kayobe-config/kayobe-env --environment ci-builder &&
9292
kayobe playbook run \
9393
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
9494
-e artifact_type="kayobe-images" \
9595
-e os_distribution='ubuntu' \
96-
-e os_release='jammy'
96+
-e os_release='noble'
9797
env:
9898
ARTIFACT_TAG: ${{ inputs.image_tag }}
9999
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
100-
if: inputs.ubuntu-jammy
100+
if: inputs.ubuntu-noble

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
description: Upload Rocky Linux 9
88
type: boolean
99
default: true
10-
ubuntu-jammy:
11-
description: Upload Ubuntu 22.04 Jammy
10+
ubuntu-noble:
11+
description: Upload Ubuntu 24.04 Noble
1212
type: boolean
1313
default: true
1414
kayobe-environment:
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- name: Validate inputs
3838
run: |
39-
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
39+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
4040
echo "At least one distribution must be selected"
4141
exit 1
4242
fi
@@ -127,47 +127,47 @@ jobs:
127127
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
128128
if: inputs.rocky9 && steps.rocky_9_image_exists.outcome == 'failure'
129129

130-
- name: Output Ubuntu Jammy image tag
131-
id: ubuntu_jammy_image_tag
130+
- name: Output Ubuntu Noble image tag
131+
id: ubuntu_noble_image_tag
132132
run: |
133-
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
133+
echo image_tag=$(grep stackhpc_ubuntu_noble_overcloud_host_image_version: src/kayobe-config/etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
134134
135135
- name: Check if image exists already
136-
id: ubuntu_jammy_image_exists
136+
id: ubuntu_noble_image_exists
137137
run: |
138138
source venvs/kayobe/bin/activate &&
139139
openstack image show \
140-
overcloud-ubuntu-jammy-${{ steps.ubuntu_jammy_image_tag.outputs.image_tag }}
140+
overcloud-ubuntu-noble-${{ steps.ubuntu_noble_image_tag.outputs.image_tag }}
141141
env:
142142
OS_CLOUD: openstack
143143
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
144144
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
145145
continue-on-error: true
146146

147-
- name: Download Ubuntu Jammy 22.04 overcloud host image from Ark
147+
- name: Download Ubuntu Noble 24.04 overcloud host image from Ark
148148
run: |
149149
source venvs/kayobe/bin/activate &&
150150
source src/kayobe-config/kayobe-env --environment ${{ inputs.kayobe-environment }} &&
151151
kayobe playbook run \
152152
src/kayobe-config/etc/kayobe/ansible/pulp-host-image-download.yml \
153153
-e os_distribution="ubuntu" \
154-
-e os_release="jammy"
154+
-e os_release="noble"
155155
env:
156156
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
157-
if: inputs.ubuntu-jammy && steps.ubuntu_jammy_image_exists.outcome == 'failure'
157+
if: inputs.ubuntu-noble && steps.ubuntu_noble_image_exists.outcome == 'failure'
158158

159-
- name: Upload Ubuntu Jammy 22.04 overcloud host image to Cloud
159+
- name: Upload Ubuntu Noble 24.04 overcloud host image to Cloud
160160
run: |
161161
source venvs/kayobe/bin/activate &&
162162
openstack image create \
163-
overcloud-ubuntu-jammy-${{ steps.ubuntu_jammy_image_tag.outputs.image_tag }} \
163+
overcloud-ubuntu-noble-${{ steps.ubuntu_noble_image_tag.outputs.image_tag }} \
164164
--container-format bare \
165165
--disk-format qcow2 \
166-
--file /tmp/ubuntu-jammy.qcow2 \
166+
--file /tmp/ubuntu-noble.qcow2 \
167167
--private \
168168
--progress
169169
env:
170170
OS_CLOUD: openstack
171171
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
172172
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
173-
if: inputs.ubuntu-jammy && steps.ubuntu_jammy_image_exists.outcome == 'failure'
173+
if: inputs.ubuntu-noble && steps.ubuntu_noble_image_exists.outcome == 'failure'

0 commit comments

Comments
 (0)