diff --git a/etc/kayobe/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml index 0a368bc9f..71292d934 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-20251027T102633" +stackhpc_rocky_9_overcloud_host_image_version: "2025.1-20251216T122459" stackhpc_ubuntu_noble_overcloud_host_image_version: "2025.1-20250930T144255" diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 63c769fb3..03b2700fe 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -56,11 +56,15 @@ stackhpc_overcloud_dib_env_vars_default: # Workaround for stack user home ownership bug DIB_IMAGE_CACHE: "/tmp/yum" +# NB: use --build-arg to pass arguments only to the Dockerfile. +# Use stackhpc_overcloud_dib_env_vars_ark keys directly for elements (eg 80-cleanup-and-restore-repofiles) stackhpc_overcloud_dib_env_vars_ark: DIB_CONTAINERFILE_BUILDOPTS: >- --build-arg=ROCKY_USE_CUSTOM_DNF_MIRRORS=true --build-arg=ROCKY_CUSTOM_DNF_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 '' }}" + # Ensure upstream repofiles are re-enabled after image build, otherwise `yum.repos.d` is left empty + DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES: true # StackHPC overcloud DIB image packages. stackhpc_overcloud_dib_packages: diff --git a/releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml b/releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml new file mode 100644 index 000000000..8ff54176d --- /dev/null +++ b/releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + The default Rocky 9 overcloud host image has been updated to include + upstream package repos out of the box