From 0fc73a644bdb7e4f583ba5ebf7ee3fcd60fb8ffc Mon Sep 17 00:00:00 2001 From: Michael Still Date: Tue, 18 Nov 2025 19:45:29 +1100 Subject: Transition to the new rabbitmq Debian package archives. RabbitMQ announced some time ago that the package archives were moving: https://www.rabbitmq.com/blog/2025/07/16/debian-apt-repositories-are-moving The old location is no longer working, so this patch transitions to the new one. Closes-Bug: #2131736 Change-Id: I6ef0ed9cc40be42a0d98c6a4c83c5c5c26d9cdbf Signed-off-by: Michael Still --- kolla/template/repos.yaml | 8 ++++---- kolla/tests/test_methods.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kolla') diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 6739c9bd1..7d9d7ec71 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -51,14 +51,14 @@ debian: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" + url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm" suite: "bookworm" component: "main" gpg_key: "rabbitmq.gpg" debian-aarch64: rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" + url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm" suite: "bookworm" component: "main" # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not @@ -93,14 +93,14 @@ ubuntu: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/noble" suite: "noble" component: "main" gpg_key: "rabbitmq.gpg" ubuntu-aarch64: rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/noble" suite: "noble" component: "main" # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 6559c5d4d..2d2fdd3ed 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -191,7 +191,7 @@ class MethodsTest(base.TestCase): } result = methods.handle_repos(template_vars, ["rabbitmq"], "enable") - expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + expectCmd = "RUN echo 'Uris: https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' " # noqa: E501 expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Components: main' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " @@ -236,7 +236,7 @@ class MethodsTest(base.TestCase): expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && " expectCmd += "echo 'Uris: " - expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + expectCmd += "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' " # noqa: E501 expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Components: main' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " -- cgit v1.2.3