From 13e429b498e1afd7b89dea68ef77977c30f5828f Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 8 Apr 2025 12:14:16 +0100 Subject: [PATCH] Fix kolla image build workflow for 2024.1 Kolla upstream change https://review.opendev.org/c/openstack/kolla/+/932386 brought Ubuntu 24.04 support for Caracal and split soruces.list.ubuntu to sources.list.ubuntu.jammy and sources.list.ubuntu.noble to cover each Ubuntu release. --- etc/kayobe/kolla.yml | 2 +- .../fix-2024.1-kolla-image-build-f78a5524381fa4da.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-2024.1-kolla-image-build-f78a5524381fa4da.yaml diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 6221b57f4..2dabe5bc2 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -304,7 +304,7 @@ kolla_build_blocks: # With the UCA keyring installed we can now add all repos. base_ubuntu_package_sources_list: | {% if stackhpc_kolla_clean_up_repo_mirrors | bool %} - COPY sources.list.ubuntu /etc/apt/sources.list.backup + COPY sources.list.ubuntu.jammy /etc/apt/sources.list.backup {% endif %} RUN \ rm /etc/apt/sources.list && \ diff --git a/releasenotes/notes/fix-2024.1-kolla-image-build-f78a5524381fa4da.yaml b/releasenotes/notes/fix-2024.1-kolla-image-build-f78a5524381fa4da.yaml new file mode 100644 index 000000000..89f02fb87 --- /dev/null +++ b/releasenotes/notes/fix-2024.1-kolla-image-build-f78a5524381fa4da.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + Fix Kolla container image build workflow failing to find default + sources.list.ubuntu. + The default sources.list for ubuntu now has each for Ubuntu Jammy and + Noble. + This upstream change was brought by `Ubuntu 24.04 support for Caracal + `__.