Skip to content

Synchronise 2025.1 with upstream #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2025
Merged

Synchronise 2025.1 with upstream #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kolla/template/repos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions kolla/tests/test_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && "
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/debian-rabbitmq-bookworm-34b2e5d9d43241da.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
upgrade:
- |
Debian container image builds now use bookworm suite
for RabbitMQ installation.