Merge pull request #470 from stackhpc/upstream/2024.1-2025-09-15

Synchronise 2024.1 with upstream

Author: priteau

kolla/template/repos.yaml

@@ -94,7 +94,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"
 
@@ -151,7 +151,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.

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"

releasenotes/notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Debian container image builds now use bookworm suite
+    for RabbitMQ installation.