From f2c1021fe09223c9220bd52439c2b8a0523238aa Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Mon, 4 Aug 2025 12:15:30 +0100 Subject: [PATCH 01/10] Build overcloud and IPA images from StackHPC package mirrors --- .../ci-builder/inventory/group_vars/seed/dev-tools | 3 +++ etc/kayobe/ipa.yml | 3 ++- etc/kayobe/overcloud-dib.yml | 6 +----- etc/kayobe/stackhpc-overcloud-dib.yml | 11 +++++------ etc/kayobe/stackhpc.yml | 9 +++++++++ 5 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools diff --git a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools new file mode 100644 index 0000000000..b7cceb7ea4 --- /dev/null +++ b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools @@ -0,0 +1,3 @@ +# Ensure we're using modern docker-buildx instead of legacy docker-build +dev_tools_packages_extra: + - "{% if os_distribution == 'ubuntu' %}docker-buildx-plugin{% endif %}" diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index ad4ca707c9..7761158680 100644 --- a/etc/kayobe/ipa.yml +++ b/etc/kayobe/ipa.yml @@ -34,6 +34,7 @@ ipa_build_dib_elements_extra: - extra-hardware - mellanox + - purge-command-not-found # List of Diskimage Builder (DIB) elements to use when building IPA images. # Default is combination of ipa_build_dib_elements_default and @@ -59,7 +60,7 @@ ipa_build_dib_elements_extra: # List of additional git repositories containing Diskimage Builder (DIB) # elements. See stackhpc.openstack.os_images role for usage. Default is empty. -#ipa_build_dib_git_elements_extra: +ipa_build_dib_git_elements_extra: "{{ stackhpc_dib_image_elements_repos }}" # List of git repositories containing Diskimage Builder (DIB) elements. See # stackhpc.openstack.os_images role for usage. Default is a combination of diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml index e824bdf5a0..625e86fa18 100644 --- a/etc/kayobe/overcloud-dib.yml +++ b/etc/kayobe/overcloud-dib.yml @@ -64,11 +64,7 @@ overcloud_dib_host_packages_extra: # List of additional git repositories containing Diskimage Builder (DIB) # elements. See stackhpc.openstack.os_images role for usage. Default is empty. -overcloud_dib_git_elements_extra: - - repo: "https://github.com/stackhpc/stackhpc-image-elements" - local: "{{ source_checkout_path }}/stackhpc-image-elements" - version: "v1.6.3" - elements_path: "elements" +overcloud_dib_git_elements_extra: "{{ stackhpc_dib_image_elements_repos }}" # List of git repositories containing Diskimage Builder (DIB) elements. See # stackhpc.openstack.os_images role for usage. Default is a combination of diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 99f5ae8362..36bcaf271e 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -22,6 +22,7 @@ stackhpc_overcloud_dib_name: "deployment_image" # StackHPC overcloud DIB image elements. stackhpc_overcloud_dib_elements: - "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container-stackhpc{% else %}minimal{% endif %}" + - "{% if os_distribution == 'ubuntu' and stackhpc_repo_mirror_auth_proxy_enabled %}apt-no-verify-peer{% endif %}" - "cloud-init-datasources" - "{% if os_distribution == 'rocky' %}selinux-permissive{% endif %}" - "enable-serial-console" @@ -43,18 +44,16 @@ stackhpc_overcloud_dib_env_vars: DIB_CONTAINERFILE_RUNTIME: "docker" DIB_CONTAINERFILE_NETWORK_DRIVER: "host" DIB_CONTAINERFILE_DOCKERFILE: "/opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc" - # NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in - # Ark does not work if the upstream mirror pulls packages (which it does - # sometimes). - # DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_focal_url if os_distribution == 'ubuntu' else '' }}" + DIB_CONTAINERFILE_BUILDOPTS: >- + --build-arg=ROCKY_USE_MIRRORS=true + --build-arg=ROCKY_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }} + DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_jammy_url if os_distribution == 'ubuntu' else '' }}" DIB_DRACUT_ENABLED_MODULES_DEFAULT_CONFIG: "{{ stackhpc_overcloud_dib_dracut_enabled_modules_default_config }}" DIB_RELEASE: "{{ overcloud_dib_os_release }}" DIB_SUDOERS_FILENAME: "no-fqdn" # Avoid DNS queries during sudo commands, since we might not always have working DNS. DIB_SUDOERS_CONFIG: | Defaults !fqdn - # FIXME: Support templating repo files. - # DIB_YUM_MINIMAL_BOOTSTRAP_REPOS: /path/to/dir/containing/dib-mirror-*.repo YUM: dnf # Workaround for stack user home ownership bug DIB_IMAGE_CACHE: "/tmp/yum" diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 4588d1e02f..e34980ef0b 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -201,3 +201,12 @@ stackhpc_amphora_image_version: "2025.1-20250619T113933" # Secret store to deploy as a Certificate Authority. # Valid options are "vault" and "openbao". Default is "openbao". stackhpc_ca_secret_store: openbao + +############################################################################### +# diskimage-builder elements repos + +stackhpc_dib_image_elements_repos: + - repo: "https://github.com/stackhpc/stackhpc-image-elements" + local: "{{ source_checkout_path }}/stackhpc-image-elements" + version: "fix-heredoc" + elements_path: "elements" From 035d3e2f7631f6181f8731fa902fcffbff2abd0a Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Mon, 4 Aug 2025 12:16:29 +0100 Subject: [PATCH 02/10] Use env hooks to setup Pulp proxy in CI Use the authenticating pulp_proxy for all CI build jobs that need packages from Ark - host images, Kolla images and the IPA image. --- .../workflows/stackhpc-container-image-build.yml | 14 +++----------- .../pre.d/10-pulp-auth-proxy.yml | 1 + .../pre.d/10-pulp-auth-proxy.yml | 1 + .../pre.d/10-pulp-auth-proxy.yml | 1 + etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 + 5 files changed, 7 insertions(+), 11 deletions(-) create mode 120000 etc/kayobe/environments/ci-builder/hooks/overcloud-container-image-build/pre.d/10-pulp-auth-proxy.yml create mode 120000 etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml create mode 120000 etc/kayobe/environments/ci-builder/hooks/overcloud-host-image-build/pre.d/10-pulp-auth-proxy.yml diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index 396fa40a59..657852dc80 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -190,17 +190,6 @@ jobs: localhost ansible_connection=local ansible_python_interpreter=/usr/bin/python3 EOF - # See etc/kayobe/ansible/roles/pulp_auth_proxy/README.md for details. - # NOTE: We override pulp_auth_proxy_conf_path to a path shared by the - # runner and dind containers. - - name: Deploy an authenticating package repository mirror proxy - run: | - source venvs/kayobe/bin/activate && - source src/kayobe-config/kayobe-env --environment ci-builder && - kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-auth-proxy.yml -e pulp_auth_proxy_conf_path=/home/runner/_work/pulp_proxy - env: - KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }} - - name: Create build logs output directory run: mkdir image-build-logs @@ -222,6 +211,9 @@ jobs: args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true" args="$args -e kolla_build_log_path=$GITHUB_WORKSPACE/image-build-logs/kolla-build-overcloud.log" args="$args -e base_path=$GITHUB_WORKSPACE/opt/kayobe" + # NOTE: We override pulp_auth_proxy_conf_path to a path shared by the + # runner and dind containers. + args="$args -e pulp_auth_proxy_conf_path=/home/runner/_work/pulp_proxy" source venvs/kayobe/bin/activate && source src/kayobe-config/kayobe-env --environment ci-builder && kayobe overcloud container image build $args diff --git a/etc/kayobe/environments/ci-builder/hooks/overcloud-container-image-build/pre.d/10-pulp-auth-proxy.yml b/etc/kayobe/environments/ci-builder/hooks/overcloud-container-image-build/pre.d/10-pulp-auth-proxy.yml new file mode 120000 index 0000000000..6e84a71044 --- /dev/null +++ b/etc/kayobe/environments/ci-builder/hooks/overcloud-container-image-build/pre.d/10-pulp-auth-proxy.yml @@ -0,0 +1 @@ +../../../../../ansible/pulp-auth-proxy.yml \ No newline at end of file diff --git a/etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml b/etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml new file mode 120000 index 0000000000..6e84a71044 --- /dev/null +++ b/etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml @@ -0,0 +1 @@ +../../../../../ansible/pulp-auth-proxy.yml \ No newline at end of file diff --git a/etc/kayobe/environments/ci-builder/hooks/overcloud-host-image-build/pre.d/10-pulp-auth-proxy.yml b/etc/kayobe/environments/ci-builder/hooks/overcloud-host-image-build/pre.d/10-pulp-auth-proxy.yml new file mode 120000 index 0000000000..6e84a71044 --- /dev/null +++ b/etc/kayobe/environments/ci-builder/hooks/overcloud-host-image-build/pre.d/10-pulp-auth-proxy.yml @@ -0,0 +1 @@ +../../../../../ansible/pulp-auth-proxy.yml \ No newline at end of file diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 18a9958ab5..981c641dd5 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -36,6 +36,7 @@ kolla_build_neutron_ovs: true # Host and port of a package repository mirror. # Build against the development Pulp service repositories. # Use Ark's package repositories to install packages. +stackhpc_repo_mirror_auth_proxy_enabled: true stackhpc_repo_mirror_url: "{{ stackhpc_repo_mirror_auth_proxy_url if stackhpc_repo_mirror_auth_proxy_enabled | bool else stackhpc_release_pulp_url }}" stackhpc_repo_mirror_username: "skc-ci-aio" stackhpc_repo_mirror_password: !vault | From ced3fbf1767395c29ffeb07a32ec62e57a7471ff Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 10 Sep 2025 11:22:29 +0100 Subject: [PATCH 03/10] Don't build IPA from Ark We've decided to move this to a separate PR --- .../pre.d/10-pulp-auth-proxy.yml | 1 - etc/kayobe/ipa.yml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 120000 etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml diff --git a/etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml b/etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml deleted file mode 120000 index 6e84a71044..0000000000 --- a/etc/kayobe/environments/ci-builder/hooks/overcloud-deployment-image-build/pre.d/10-pulp-auth-proxy.yml +++ /dev/null @@ -1 +0,0 @@ -../../../../../ansible/pulp-auth-proxy.yml \ No newline at end of file diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index 7761158680..ad4ca707c9 100644 --- a/etc/kayobe/ipa.yml +++ b/etc/kayobe/ipa.yml @@ -34,7 +34,6 @@ ipa_build_dib_elements_extra: - extra-hardware - mellanox - - purge-command-not-found # List of Diskimage Builder (DIB) elements to use when building IPA images. # Default is combination of ipa_build_dib_elements_default and @@ -60,7 +59,7 @@ ipa_build_dib_elements_extra: # List of additional git repositories containing Diskimage Builder (DIB) # elements. See stackhpc.openstack.os_images role for usage. Default is empty. -ipa_build_dib_git_elements_extra: "{{ stackhpc_dib_image_elements_repos }}" +#ipa_build_dib_git_elements_extra: # List of git repositories containing Diskimage Builder (DIB) elements. See # stackhpc.openstack.os_images role for usage. Default is a combination of From c9734071d18559bc6330d5a53ec3c44f97b12784 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 10 Sep 2025 13:40:53 +0100 Subject: [PATCH 04/10] Use tagged release of stackhpc-image-elements --- etc/kayobe/stackhpc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index e34980ef0b..46520315d9 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -208,5 +208,5 @@ stackhpc_ca_secret_store: openbao stackhpc_dib_image_elements_repos: - repo: "https://github.com/stackhpc/stackhpc-image-elements" local: "{{ source_checkout_path }}/stackhpc-image-elements" - version: "fix-heredoc" + version: "v1.6.4" elements_path: "elements" From e9e3213c72a311878be23f8c81d548387f2b86af Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 15 Sep 2025 13:08:02 +0100 Subject: [PATCH 05/10] Use noble for DIB_DISTRIBUTION_MIRROR --- etc/kayobe/stackhpc-overcloud-dib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 36bcaf271e..9a201fd54a 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -47,7 +47,7 @@ stackhpc_overcloud_dib_env_vars: DIB_CONTAINERFILE_BUILDOPTS: >- --build-arg=ROCKY_USE_MIRRORS=true --build-arg=ROCKY_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }} - DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_jammy_url if os_distribution == 'ubuntu' else '' }}" + DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}" DIB_DRACUT_ENABLED_MODULES_DEFAULT_CONFIG: "{{ stackhpc_overcloud_dib_dracut_enabled_modules_default_config }}" DIB_RELEASE: "{{ overcloud_dib_os_release }}" DIB_SUDOERS_FILENAME: "no-fqdn" From 7d1c744e0bb23d68f082252162c6b706b1774af3 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Tue, 16 Sep 2025 13:48:44 +0100 Subject: [PATCH 06/10] Install docker-buildx after configuring host --- .github/workflows/overcloud-host-image-build.yml | 2 +- .../ci-builder/inventory/group_vars/seed/dev-tools | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools diff --git a/.github/workflows/overcloud-host-image-build.yml b/.github/workflows/overcloud-host-image-build.yml index 54777bd6cb..145cc3170f 100644 --- a/.github/workflows/overcloud-host-image-build.yml +++ b/.github/workflows/overcloud-host-image-build.yml @@ -212,7 +212,7 @@ jobs: source venvs/kayobe/bin/activate && source src/kayobe-config/kayobe-env --environment ci-builder && kayobe seed host command run \ - --command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv" --show-output + --command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv containerd docker.io docker-buildx" --show-output env: KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }} diff --git a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools deleted file mode 100644 index b7cceb7ea4..0000000000 --- a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/dev-tools +++ /dev/null @@ -1,3 +0,0 @@ -# Ensure we're using modern docker-buildx instead of legacy docker-build -dev_tools_packages_extra: - - "{% if os_distribution == 'ubuntu' %}docker-buildx-plugin{% endif %}" From fa5bae39ab56d0b3de80a22e495122f86b056bbe Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Tue, 16 Sep 2025 15:08:09 +0100 Subject: [PATCH 07/10] Keep building from Ark behind a flag --- .../ci-builder/stackhpc-overcloud-host-images.yml | 3 +++ etc/kayobe/stackhpc-overcloud-dib.yml | 14 +++++++++----- etc/kayobe/stackhpc-overcloud-host-images.yml | 3 +++ 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 etc/kayobe/environments/ci-builder/stackhpc-overcloud-host-images.yml diff --git a/etc/kayobe/environments/ci-builder/stackhpc-overcloud-host-images.yml b/etc/kayobe/environments/ci-builder/stackhpc-overcloud-host-images.yml new file mode 100644 index 0000000000..886b1773a7 --- /dev/null +++ b/etc/kayobe/environments/ci-builder/stackhpc-overcloud-host-images.yml @@ -0,0 +1,3 @@ +--- +# Whether or not to build overcloud host images from Ark +stackhpc_build_overcloud_image_from_pulp_package_mirrors: true diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 9a201fd54a..89d6ac5984 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -35,7 +35,9 @@ stackhpc_overcloud_dib_elements: - "{% if os_distribution == 'ubuntu' %}sudoers{% endif %}" # StackHPC overcloud DIB image environment variables. -stackhpc_overcloud_dib_env_vars: +stackhpc_overcloud_dib_env_vars: "{{ stackhpc_overcloud_dib_env_vars_default | combine(stackhpc_overcloud_dib_env_vars_ark if stackhpc_build_overcloud_image_from_pulp_package_mirrors | bool else {}) }}" + +stackhpc_overcloud_dib_env_vars_default: DIB_BLOCK_DEVICE_CONFIG: "{{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}" DIB_BOOTLOADER_DEFAULT_CMDLINE: "nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto" DIB_GRUB_TIMEOUT: "5" @@ -44,10 +46,6 @@ stackhpc_overcloud_dib_env_vars: DIB_CONTAINERFILE_RUNTIME: "docker" DIB_CONTAINERFILE_NETWORK_DRIVER: "host" DIB_CONTAINERFILE_DOCKERFILE: "/opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc" - DIB_CONTAINERFILE_BUILDOPTS: >- - --build-arg=ROCKY_USE_MIRRORS=true - --build-arg=ROCKY_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }} - DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}" DIB_DRACUT_ENABLED_MODULES_DEFAULT_CONFIG: "{{ stackhpc_overcloud_dib_dracut_enabled_modules_default_config }}" DIB_RELEASE: "{{ overcloud_dib_os_release }}" DIB_SUDOERS_FILENAME: "no-fqdn" @@ -58,6 +56,12 @@ stackhpc_overcloud_dib_env_vars: # Workaround for stack user home ownership bug DIB_IMAGE_CACHE: "/tmp/yum" +stackhpc_overcloud_dib_env_vars_ark: + DIB_CONTAINERFILE_BUILDOPTS: >- + --build-arg=ROCKY_USE_MIRRORS=true + --build-arg=ROCKY_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }} + DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}" + # StackHPC overcloud DIB image packages. stackhpc_overcloud_dib_packages: - "ethtool" diff --git a/etc/kayobe/stackhpc-overcloud-host-images.yml b/etc/kayobe/stackhpc-overcloud-host-images.yml index c009f8e8fe..59c3626b8e 100644 --- a/etc/kayobe/stackhpc-overcloud-host-images.yml +++ b/etc/kayobe/stackhpc-overcloud-host-images.yml @@ -5,6 +5,9 @@ # Whether or not to download overcloud host images from Ark stackhpc_download_overcloud_host_images: false +# Whether or not to build overcloud host images from Ark +stackhpc_build_overcloud_image_from_pulp_package_mirrors: false + # The overcloud host image source, defined by os_distribution, os_release, # and the current stable version. stackhpc_overcloud_host_image_url: "{{ stackhpc_release_pulp_content_url_with_auth }}/kayobe-images/\ From 8d72c01ed84c087fbaeac5b086864550aa45ce72 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Tue, 16 Sep 2025 15:44:18 +0100 Subject: [PATCH 08/10] Add release note --- .../notes/build-images-from-ark-6eb0d5c8779bb970.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml diff --git a/releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml b/releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml new file mode 100644 index 0000000000..46950506cf --- /dev/null +++ b/releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + Added support for building overcloud host images from Pulp package mirrors. + This feature can be toggled with the flag + ``stackhpc_build_overcloud_image_from_pulp_package_mirrors``. For the CI + Builder environment, this is enabled, so our StackHPC overcloud host images + will now be built with packages from Ark. From 16fffda3388dd751bcff9709867ab07401f90fd4 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 17 Sep 2025 11:10:07 +0100 Subject: [PATCH 09/10] New overcloud host images build from Ark packages --- etc/kayobe/pulp-host-image-versions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml index 4a189c65b2..b118afb5b8 100644 --- a/etc/kayobe/pulp-host-image-versions.yml +++ b/etc/kayobe/pulp-host-image-versions.yml @@ -1,5 +1,5 @@ --- # Overcloud host image versioning tags # These images must be in SMS, since they are used by our AIO CI runners -stackhpc_rocky_9_overcloud_host_image_version: "2025.1-20250620T125648" -stackhpc_ubuntu_noble_overcloud_host_image_version: "2025.1-20250620T125648" +stackhpc_rocky_9_overcloud_host_image_version: "2025.1-20250916T145046" +stackhpc_ubuntu_noble_overcloud_host_image_version: "2025.1-20250916T145046" From 53d18e8536dbc228fe520c2a81ed3b995603f184 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 17 Sep 2025 11:21:46 +0100 Subject: [PATCH 10/10] Reword release note --- .../notes/build-images-from-ark-6eb0d5c8779bb970.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml b/releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml index 46950506cf..d1486252ee 100644 --- a/releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml +++ b/releasenotes/notes/build-images-from-ark-6eb0d5c8779bb970.yaml @@ -3,6 +3,7 @@ features: - | Added support for building overcloud host images from Pulp package mirrors. This feature can be toggled with the flag - ``stackhpc_build_overcloud_image_from_pulp_package_mirrors``. For the CI - Builder environment, this is enabled, so our StackHPC overcloud host images - will now be built with packages from Ark. + ``stackhpc_build_overcloud_image_from_pulp_package_mirrors``. By default, + this feature is enabled in the ``ci-builder`` environment and disabled + otherwise. StackHPC overcloud host images will now be built with packages + from Ark.