From d67fd2fcbc38cde5351f6e41c579758be71cd5d6 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 27 Sep 2023 08:12:10 +0000 Subject: rabbitmq: Use novemberain repos for Debian/Ubuntu CloudSmith is over budget, see [1]. As mentionedin in [2] - we're using amd64 packages on aarch64, since the community mirror does not mirror aarch64 - and the packages should be really marked as noarch. [3] has also been incorporated in this backport [1]: https://github.com/rabbitmq/rabbitmq-server/discussions/9526 [2]: https://github.com/rabbitmq/rabbitmq-server/discussions/9553 [3]: https://review.opendev.org/c/openstack/kolla/+/896927 Closes-Bug: #2037469 Change-Id: I83179ce5d53fed6cfe7f5fcbf6fdecd7199baa36 (cherry picked from commit 47b593d1e5531c693dde3e111ed3be91c60c41be) --- kolla/tests/test_methods.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'kolla/tests') diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 39ef20c64..53529e758 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -78,6 +78,28 @@ class MethodsTest(base.TestCase): expectCmd += ">>/etc/apt/sources.list.d/grafana.sources" self.assertEqual(expectCmd, result) + def test_enable_repos_debian_arch(self): + template_vars = { + 'base_arch': 'aarch64', + 'base_distro': 'debian', + 'base_package_type': 'deb' + } + + result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable') + expectCmd = "RUN echo 'Uris: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " + expectCmd += "echo 'Components: main' " + 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 += ">>/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 && " + expectCmd += "echo 'Architectures: amd64' " + expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources" + self.assertEqual(expectCmd, result) + def test_enable_repos_debian_missing_repo(self): template_vars = { 'base_arch': 'x86_64', @@ -111,7 +133,7 @@ class MethodsTest(base.TestCase): expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && " expectCmd += "echo 'Uris: " - expectCmd += "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + expectCmd += "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # 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