From c445597590bea2c5b36515ff266c076f4ab26170 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Wed, 21 May 2025 13:56:46 +0200 Subject: [PATCH] debian: Use bookworkm suite for rabbitmq APT repo Change-Id: Ifd664de82a81830eeda8ccc019b22ee93768635e (cherry picked from commit c930c9fb9c435cf0681a15a84814ff91eb055b9f) --- kolla/template/repos.yaml | 4 ++-- kolla/tests/test_methods.py | 4 ++-- .../notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index a88c8aff11..c3772e6e2c 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -88,7 +88,7 @@ debian: gpg_key: "proxysql.asc" rabbitmq: url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" - suite: "bullseye" + suite: "bookworm" component: "main" gpg_key: "rabbitmq.gpg" @@ -140,7 +140,7 @@ debian-aarch64: gpg_key: "proxysql.asc" rabbitmq: url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" - suite: "bullseye" + suite: "bookworm" component: "main" # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not # syncing binary-aarch64 - we're using amd64 here. diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index dcdc4f4e95..afa21e2ab2 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -92,7 +92,7 @@ def test_enable_repos_debian_arch(self): expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Types: deb' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " - expectCmd += "echo 'Suites: bullseye' " + expectCmd += "echo 'Suites: bookworm' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " @@ -139,7 +139,7 @@ def test_enable_repos_debian_multiple(self): expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Types: deb' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " - expectCmd += "echo 'Suites: bullseye' " + expectCmd += "echo 'Suites: bookworm' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources" diff --git a/releasenotes/notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml b/releasenotes/notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml new file mode 100644 index 0000000000..295de86f0a --- /dev/null +++ b/releasenotes/notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Debian container image builds now use bookworm suite + for RabbitMQ installation.