rabbitmq: Switch to Cloudsmith mirrors

PackageCloud is discontinued as of August 18th [1].

Also corrects the versions docs for RabbitMQ and Erlang.

Use new RMQ Cloudsmith repo URLs, these now use
*.rabbitmq.com domains [2].

1. https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024
2. https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#mirrors-now-use-rabbitmqcom-domains

Change-Id: I2cce3dd2540c878878ff0aae80ee5a7e0f455da7
(cherry picked from commit 528b7eef16)
This commit is contained in:
Matt Crees 2024-09-11 15:48:55 +01:00 committed by Michal Nasiadka
parent 4df43abd70
commit 6f63211cff
6 changed files with 31 additions and 18 deletions

View File

@ -23,14 +23,14 @@ information about package sources.
Galera 26.4 (LTS) `MariaDB Community downloads`_ Galera 26.4 (LTS) `MariaDB Community downloads`_
OpenSearch 2.x `OpenSearch install guide`_ OpenSearch 2.x `OpenSearch install guide`_
ProxySQL 2.6.x `ProxySQL repository`_ ProxySQL 2.6.x `ProxySQL repository`_
Rabbitmq 3.10.x - CentOS: Rabbitmq 3.13.x - CentOS/Rocky:
`Team RabbitMQ 'PackageCloud' repository`_ `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
- Debian/Ubuntu: - Debian/Ubuntu:
`Team RabbitMQ 'Cloudsmith' repository`_ `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
Erlang 25.x - CentOS aarch64: Erlang 26.2.X - CentOS/Rocky aarch64:
`Hrw's COPR`_ `Hrw's COPR`_
- CentOS x86-64: - CentOS/Rocky x86-64:
`Team RabbitMQ 'PackageCloud' repository`_ `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
- Debian/Ubuntu: - Debian/Ubuntu:
`Team RabbitMQ 'Modern Erlang' PPA`_ `Team RabbitMQ 'Modern Erlang' PPA`_
TD Agent 4.4.x `TreasureData install guide`_ TD Agent 4.4.x `TreasureData install guide`_
@ -44,9 +44,9 @@ information about package sources.
.. _`TreasureData install guide`: https://www.fluentd.org/download .. _`TreasureData install guide`: https://www.fluentd.org/download
.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/ .. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/
.. _`Team RabbitMQ 'Cloudsmith' repository`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith .. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
.. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang .. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang
.. _`Team RabbitMQ 'PackageCloud' repository`: https://www.rabbitmq.com/install-rpm.html#package-cloud .. _`Team RabbitMQ 'Cloudsmith' repo (RPM)`: https://www.rabbitmq.com/docs/install-rpm#cloudsmith
.. _`Hrw's COPR`: https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/ .. _`Hrw's COPR`: https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/
.. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss .. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss

View File

@ -1,6 +1,9 @@
[rabbitmq_rabbitmq-erlang] [rabbitmq_rabbitmq-erlang]
name=rabbitmq_rabbitmq-erlang name=rabbitmq_rabbitmq-erlang
baseurl=https://packagecloud.io/rabbitmq/erlang/el/9/$basearch # Use a set of mirrors maintained by the RabbitMQ core team.
# The mirrors have significantly higher bandwidth quotas.
baseurl=https://yum1.rabbitmq.com/erlang/el/9/$basearch
https://yum2.rabbitmq.com/erlang/el/9/$basearch
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key

View File

@ -1,6 +1,9 @@
[rabbitmq_rabbitmq-server] [rabbitmq_rabbitmq-server]
name=rabbitmq_rabbitmq-server name=rabbitmq_rabbitmq-server
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/9/$basearch baseurl=https://yum2.rabbitmq.com/rabbitmq/el/9/noarch
https://yum1.rabbitmq.com/rabbitmq/el/9/noarch
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc # Cloudsmith's repository key and RabbitMQ package signing key
gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
https://github.com/rabbitmq/signing-keys/releases/download/3.0/rabbitmq-release-signing-key.asc

View File

@ -80,7 +80,7 @@ debian:
component: "" component: ""
gpg_key: "proxysql.asc" gpg_key: "proxysql.asc"
rabbitmq: rabbitmq:
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian" url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
suite: "bullseye" suite: "bullseye"
component: "main" component: "main"
gpg_key: "rabbitmq.gpg" gpg_key: "rabbitmq.gpg"
@ -127,7 +127,7 @@ debian-aarch64:
component: "" component: ""
gpg_key: "proxysql.asc" gpg_key: "proxysql.asc"
rabbitmq: rabbitmq:
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian" url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
suite: "bullseye" suite: "bullseye"
component: "main" component: "main"
# NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not
@ -213,7 +213,7 @@ ubuntu:
component: "" component: ""
gpg_key: "proxysql.asc" gpg_key: "proxysql.asc"
rabbitmq: rabbitmq:
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu" url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
suite: "jammy" suite: "jammy"
component: "main" component: "main"
gpg_key: "rabbitmq.gpg" gpg_key: "rabbitmq.gpg"
@ -260,7 +260,7 @@ ubuntu-aarch64:
component: "" component: ""
gpg_key: "proxysql.asc" gpg_key: "proxysql.asc"
rabbitmq: rabbitmq:
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu" url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
suite: "jammy" suite: "jammy"
component: "main" component: "main"
arch: "amd64" arch: "amd64"

View File

@ -86,7 +86,7 @@ class MethodsTest(base.TestCase):
} }
result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable') result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable')
expectCmd = "RUN echo 'Uris: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
expectCmd += "echo 'Components: main' " expectCmd += "echo 'Components: main' "
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
@ -133,7 +133,7 @@ class MethodsTest(base.TestCase):
expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && " expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
expectCmd += "echo 'Uris: " expectCmd += "echo 'Uris: "
expectCmd += "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
expectCmd += "echo 'Components: main' " expectCmd += "echo 'Components: main' "
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
RabbitMQ and Erlang packages are now all installed from the Cloudsmith
``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
shut down August 18st, 2024:
https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024