Skip to content

Commit 6f63211

Browse files
MoteHuemnasiadka
authored andcommitted
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 528b7ee)
1 parent 4df43ab commit 6f63211

File tree

6 files changed

+31
-18
lines changed

6 files changed

+31
-18
lines changed

doc/source/contributor/versions.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ information about package sources.
2323
Galera 26.4 (LTS) `MariaDB Community downloads`_
2424
OpenSearch 2.x `OpenSearch install guide`_
2525
ProxySQL 2.6.x `ProxySQL repository`_
26-
Rabbitmq 3.10.x - CentOS:
27-
`Team RabbitMQ 'PackageCloud' repository`_
26+
Rabbitmq 3.13.x - CentOS/Rocky:
27+
`Team RabbitMQ 'Cloudsmith' repo (RPM)`_
2828
- Debian/Ubuntu:
29-
`Team RabbitMQ 'Cloudsmith' repository`_
30-
Erlang 25.x - CentOS aarch64:
29+
`Team RabbitMQ 'Cloudsmith' repo (Deb)`_
30+
Erlang 26.2.X - CentOS/Rocky aarch64:
3131
`Hrw's COPR`_
32-
- CentOS x86-64:
33-
`Team RabbitMQ 'PackageCloud' repository`_
32+
- CentOS/Rocky x86-64:
33+
`Team RabbitMQ 'Cloudsmith' repo (RPM)`_
3434
- Debian/Ubuntu:
3535
`Team RabbitMQ 'Modern Erlang' PPA`_
3636
TD Agent 4.4.x `TreasureData install guide`_
@@ -44,9 +44,9 @@ information about package sources.
4444
.. _`TreasureData install guide`: https://www.fluentd.org/download
4545
.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/
4646

47-
.. _`Team RabbitMQ 'Cloudsmith' repository`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
47+
.. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
4848
.. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang
49-
.. _`Team RabbitMQ 'PackageCloud' repository`: https://www.rabbitmq.com/install-rpm.html#package-cloud
49+
.. _`Team RabbitMQ 'Cloudsmith' repo (RPM)`: https://www.rabbitmq.com/docs/install-rpm#cloudsmith
5050
.. _`Hrw's COPR`: https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/
5151

5252
.. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
[rabbitmq_rabbitmq-erlang]
22
name=rabbitmq_rabbitmq-erlang
3-
baseurl=https://packagecloud.io/rabbitmq/erlang/el/9/$basearch
3+
# Use a set of mirrors maintained by the RabbitMQ core team.
4+
# The mirrors have significantly higher bandwidth quotas.
5+
baseurl=https://yum1.rabbitmq.com/erlang/el/9/$basearch
6+
https://yum2.rabbitmq.com/erlang/el/9/$basearch
47
gpgcheck=1
58
enabled=0
6-
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
9+
gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
[rabbitmq_rabbitmq-server]
22
name=rabbitmq_rabbitmq-server
3-
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/9/$basearch
3+
baseurl=https://yum2.rabbitmq.com/rabbitmq/el/9/noarch
4+
https://yum1.rabbitmq.com/rabbitmq/el/9/noarch
45
gpgcheck=1
56
enabled=0
6-
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
7+
# Cloudsmith's repository key and RabbitMQ package signing key
8+
gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
9+
https://github.com/rabbitmq/signing-keys/releases/download/3.0/rabbitmq-release-signing-key.asc

kolla/template/repos.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ debian:
8080
component: ""
8181
gpg_key: "proxysql.asc"
8282
rabbitmq:
83-
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian"
83+
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
8484
suite: "bullseye"
8585
component: "main"
8686
gpg_key: "rabbitmq.gpg"
@@ -127,7 +127,7 @@ debian-aarch64:
127127
component: ""
128128
gpg_key: "proxysql.asc"
129129
rabbitmq:
130-
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian"
130+
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
131131
suite: "bullseye"
132132
component: "main"
133133
# NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not
@@ -213,7 +213,7 @@ ubuntu:
213213
component: ""
214214
gpg_key: "proxysql.asc"
215215
rabbitmq:
216-
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu"
216+
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
217217
suite: "jammy"
218218
component: "main"
219219
gpg_key: "rabbitmq.gpg"
@@ -260,7 +260,7 @@ ubuntu-aarch64:
260260
component: ""
261261
gpg_key: "proxysql.asc"
262262
rabbitmq:
263-
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu"
263+
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
264264
suite: "jammy"
265265
component: "main"
266266
arch: "amd64"

kolla/tests/test_methods.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_enable_repos_debian_arch(self):
8686
}
8787

8888
result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable')
89-
expectCmd = "RUN echo 'Uris: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
89+
expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
9090
expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
9191
expectCmd += "echo 'Components: main' "
9292
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
@@ -133,7 +133,7 @@ def test_enable_repos_debian_multiple(self):
133133
expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
134134

135135
expectCmd += "echo 'Uris: "
136-
expectCmd += "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
136+
expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
137137
expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
138138
expectCmd += "echo 'Components: main' "
139139
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
upgrade:
3+
- |
4+
RabbitMQ and Erlang packages are now all installed from the Cloudsmith
5+
``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
6+
shut down August 18st, 2024:
7+
https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024

0 commit comments

Comments
 (0)