diff options
| author | Zuul <zuul@review.opendev.org> | 2025-05-31 00:27:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-05-31 00:27:04 +0000 |
| commit | 475f81f62d95419d105934a07572d78bd02997cb (patch) | |
| tree | 9897b9642c0c505e327b4ac66afa10fac43d952f | |
| parent | e589707953a56e8c619ec29e94b126c8ae6198e1 (diff) | |
| parent | c930c9fb9c435cf0681a15a84814ff91eb055b9f (diff) | |
| download | kolla-475f81f62d95419d105934a07572d78bd02997cb.tar.gz kolla-475f81f62d95419d105934a07572d78bd02997cb.zip | |
Merge "debian: Use bookworkm suite for rabbitmq APT repo"
| -rw-r--r-- | kolla/template/repos.yaml | 4 | ||||
| -rw-r--r-- | kolla/tests/test_methods.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index c549f76c5..907909eac 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 dcdc4f4e9..afa21e2ab 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -92,7 +92,7 @@ class MethodsTest(base.TestCase): 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 @@ class MethodsTest(base.TestCase): 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 000000000..295de86f0 --- /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. |