Skip to content

Master: Find/Replace Jammy/Noble #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/ipa-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
description: Build Rocky Linux 9
type: boolean
default: true
ubuntu-jammy:
description: Build Ubuntu 22.04 Jammy
ubuntu-noble:
description: Build Ubuntu 24.04 Noble
type: boolean
default: true
secrets:
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
ssh_public_key = "id_rsa.pub"
ssh_username = "ubuntu"
aio_vm_name = "skc-ipa-image-builder"
aio_vm_image = "Ubuntu-22.04"
aio_vm_image = "Ubuntu-24.04"
aio_vm_flavor = "en1.large"
aio_vm_network = "stackhpc-ci"
aio_vm_subnet = "stackhpc-ci"
Expand Down Expand Up @@ -197,20 +197,20 @@ jobs:
env:
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}

- name: Build a Ubuntu 22.04 Jammy IPA image
id: build_ubuntu_jammy_ipa
- name: Build a Ubuntu 24.04 Noble IPA image
id: build_ubuntu_noble_ipa
continue-on-error: true
run: |
source venvs/kayobe/bin/activate &&
source src/kayobe-config/kayobe-env --environment ci-builder &&
kayobe overcloud deployment image build --force-rebuild \
-e os_distribution="ubuntu" \
-e os_release="jammy" \
-e os_release="noble" \
-e ipa_ci_builder_distribution="ubuntu" \
-e ipa_ci_builder_release="jammy"
-e ipa_ci_builder_release="noble"
env:
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
if: inputs.ubuntu-jammy
if: inputs.ubuntu-noble

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

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

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

- name: Build a Rocky 9 IPA image
id: build_rocky_9_ipa
Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
echo "Builds failed. See workflow artifacts for details." &&
exit 1
if: steps.build_rocky_9_ipa.outcome == 'failure' ||
steps.build_ubuntu_jammy_ipa.outcome == 'failure'
steps.build_ubuntu_noble_ipa.outcome == 'failure'

- name: Destroy
run: terraform destroy -auto-approve
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ipa-image-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
description: Promote Rocky Linux 9
type: boolean
default: true
ubuntu-jammy:
description: Promote Ubuntu 22.04 Jammy
ubuntu-noble:
description: Promote Ubuntu 24.04 Noble
type: boolean
default: true
image_tag:
Expand All @@ -21,11 +21,11 @@ jobs:
ipa-image-promote:
name: Promote IPA image
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Validate inputs
run: |
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
echo "At least one distribution must be selected"
exit 1
fi
Expand Down Expand Up @@ -85,16 +85,16 @@ jobs:
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
if: inputs.rocky9

- name: Promote Ubuntu Jammy 22.04 IPA image artifact
- name: Promote Ubuntu Noble 24.04 IPA image artifact
run: |
source venvs/kayobe/bin/activate &&
source src/kayobe-config/kayobe-env --environment ci-builder &&
kayobe playbook run \
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
-e artifact_type="ipa-images" \
-e os_distribution='ubuntu' \
-e os_release='jammy'
-e os_release='noble'
env:
ARTIFACT_TAG: ${{ inputs.image_tag }}
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
if: inputs.ubuntu-jammy
if: inputs.ubuntu-noble
4 changes: 3 additions & 1 deletion .github/workflows/multinode-inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ class Scenario:

ROCKY_9 = OSRelease("rocky", "9", "cloud-user")
UBUNTU_JAMMY = OSRelease("ubuntu", "jammy", "ubuntu")
UBUNTU_NOBLE = OSRelease("ubuntu", "noble", "ubuntu")
# NOTE(upgrade): Add supported releases here.
OPENSTACK_RELEASES = [
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
OpenStackRelease("master", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
]
NEUTRON_PLUGINS = ["ovs", "ovn"]

Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/overcloud-host-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
description: Build Rocky Linux 9
type: boolean
default: true
ubuntu-jammy:
description: Build Ubuntu 22.04 Jammy
ubuntu-noble:
description: Build Ubuntu 24.04 Noble
type: boolean
default: true
secrets:
Expand All @@ -34,7 +34,7 @@ jobs:
steps:
- name: Validate inputs
run: |
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
echo "At least one distribution must be selected"
exit 1
fi
Expand Down Expand Up @@ -107,9 +107,9 @@ jobs:
ssh_public_key = "id_rsa.pub"
ssh_username = "ubuntu"
aio_vm_name = "skc-host-image-builder"
# Must be an Ubuntu Jammy host to successfully build all images
# Must be an Ubuntu Noble host to successfully build all images
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
aio_vm_image = "Ubuntu-22.04"
aio_vm_image = "Ubuntu-24.04"
aio_vm_flavor = "en1.medium"
aio_vm_network = "stackhpc-ci"
aio_vm_subnet = "stackhpc-ci"
Expand Down Expand Up @@ -264,59 +264,59 @@ jobs:
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'

- name: Build an Ubuntu Jammy 22.04 overcloud host image
id: build_ubuntu_jammy
- name: Build an Ubuntu Noble 24.04 overcloud host image
id: build_ubuntu_noble
continue-on-error: true
run: |
source venvs/kayobe/bin/activate &&
source src/kayobe-config/kayobe-env --environment ci-builder &&
kayobe overcloud host image build --force-rebuild \
-e os_distribution="ubuntu" \
-e os_release="jammy" \
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-jammy
-e os_release="noble" \
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-noble
env:
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
if: inputs.ubuntu-jammy
if: inputs.ubuntu-noble

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

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

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

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

- name: Upload logs artifact
uses: actions/upload-artifact@v4
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/overcloud-host-image-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
description: Promote Rocky Linux 9
type: boolean
default: true
ubuntu-jammy:
description: Promote Ubuntu 22.04 Jammy
ubuntu-noble:
description: Promote Ubuntu 24.04 Noble
type: boolean
default: true
image_tag:
Expand All @@ -21,11 +21,11 @@ jobs:
overcloud-host-image-promote:
name: Promote overcloud host image
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Validate inputs
run: |
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
echo "At least one distribution must be selected"
exit 1
fi
Expand Down Expand Up @@ -85,16 +85,16 @@ jobs:
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
if: inputs.rocky9

- name: Promote Ubuntu Jammy 22.04 overcloud host image artifact
- name: Promote Ubuntu Noble 24.04 overcloud host image artifact
run: |
source venvs/kayobe/bin/activate &&
source src/kayobe-config/kayobe-env --environment ci-builder &&
kayobe playbook run \
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
-e artifact_type="kayobe-images" \
-e os_distribution='ubuntu' \
-e os_release='jammy'
-e os_release='noble'
env:
ARTIFACT_TAG: ${{ inputs.image_tag }}
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
if: inputs.ubuntu-jammy
if: inputs.ubuntu-noble
30 changes: 15 additions & 15 deletions .github/workflows/overcloud-host-image-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
description: Upload Rocky Linux 9
type: boolean
default: true
ubuntu-jammy:
description: Upload Ubuntu 22.04 Jammy
ubuntu-noble:
description: Upload Ubuntu 24.04 Noble
type: boolean
default: true
kayobe-environment:
Expand Down Expand Up @@ -36,7 +36,7 @@ jobs:
steps:
- name: Validate inputs
run: |
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
echo "At least one distribution must be selected"
exit 1
fi
Expand Down Expand Up @@ -127,47 +127,47 @@ jobs:
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
if: inputs.rocky9 && steps.rocky_9_image_exists.outcome == 'failure'

- name: Output Ubuntu Jammy image tag
id: ubuntu_jammy_image_tag
- name: Output Ubuntu Noble image tag
id: ubuntu_noble_image_tag
run: |
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
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

- name: Check if image exists already
id: ubuntu_jammy_image_exists
id: ubuntu_noble_image_exists
run: |
source venvs/kayobe/bin/activate &&
openstack image show \
overcloud-ubuntu-jammy-${{ steps.ubuntu_jammy_image_tag.outputs.image_tag }}
overcloud-ubuntu-noble-${{ steps.ubuntu_noble_image_tag.outputs.image_tag }}
env:
OS_CLOUD: openstack
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
continue-on-error: true

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

- name: Upload Ubuntu Jammy 22.04 overcloud host image to Cloud
- name: Upload Ubuntu Noble 24.04 overcloud host image to Cloud
run: |
source venvs/kayobe/bin/activate &&
openstack image create \
overcloud-ubuntu-jammy-${{ steps.ubuntu_jammy_image_tag.outputs.image_tag }} \
overcloud-ubuntu-noble-${{ steps.ubuntu_noble_image_tag.outputs.image_tag }} \
--container-format bare \
--disk-format qcow2 \
--file /tmp/ubuntu-jammy.qcow2 \
--file /tmp/ubuntu-noble.qcow2 \
--private \
--progress
env:
OS_CLOUD: openstack
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
if: inputs.ubuntu-jammy && steps.ubuntu_jammy_image_exists.outcome == 'failure'
if: inputs.ubuntu-noble && steps.ubuntu_noble_image_exists.outcome == 'failure'
Loading
Loading