Merge pull request #356 from stackhpc/upstream/2023.1-2024-10-02

Synchronise 2023.1 with upstream
stackhpc · Oct 2, 2024 · be4629f · be4629f
2 parents a51711a + 9066422
commit be4629f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
@@ -28,7 +28,7 @@ information about package sources.
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
  Erlang         25.X.X             - CentOS/Rocky aarch64:
-                                     `Hrw's COPR`_
+                                     `openstack-kolla COPR`_
                                    - CentOS/Rocky x86-64:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
@@ -47,7 +47,7 @@ information about package sources.
 .. _`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 'Cloudsmith' repo (RPM)`: https://www.rabbitmq.com/docs/install-rpm#cloudsmith
-.. _`Hrw's COPR`: https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/
+.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang/
 
 .. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss
 .. _`MariaDB Community downloads`: https://mariadb.com/downloads/community/
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
@@ -78,7 +78,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
 
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = base_yum_repo_files + [
-        'hrw-copr-erlang-for-rabbitmq.repo',
+        'copr-rabbitmq-erlang.repo',
     ] %}
 
 {#

diff --git a/docker/base/copr-rabbitmq-erlang.repo b/docker/base/copr-rabbitmq-erlang.repo
@@ -0,0 +1,11 @@
+# NOTE(hrw): this repository contains rebuild of Erlang package from RabbitMQ team
+# from https://github.com/rabbitmq/erlang-rpm/
+# Thanks to COPR we have aarch64 packages for CentOS Stream 9
+
+[openstack-kolla-copr-rabbitmq-kolla]
+name=openstack-kolla COPR with Erlang build for RabbitMQ
+baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/centos-stream-$releasever-aarch64/
+gpgcheck=1
+enabled=0
+gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/pubkey.gpg
+repo_gpgcheck=0
diff --git a/docker/base/hrw-copr-erlang-for-rabbitmq.repo b/docker/base/hrw-copr-erlang-for-rabbitmq.repo
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
@@ -21,7 +21,7 @@ centos-aarch64:
   ceph: "centos-ceph-quincy"
   crb: "crb"
   epel: "epel"
-  erlang: "copr-hrw-erlang-for-rabbitmq"
+  erlang: "copr-rabbitmq-erlang"
   extras: "extras"
   grafana: "grafana"
   hacluster: "highavailability"
@@ -162,7 +162,7 @@ rocky-aarch64:
   ceph: "centos-ceph-quincy"
   crb: "crb"
   epel: "epel"
-  erlang: "copr-hrw-erlang-for-rabbitmq"
+  erlang: "copr-rabbitmq-erlang"
   extras: "extras"
   grafana: "grafana"
   influxdb: "influxdb"

diff --git a/releasenotes/notes/copr-move-5d0464c50dc85ccf.yaml b/releasenotes/notes/copr-move-5d0464c50dc85ccf.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    ``Erlang`` RPMs on ``aarch64`` architecture are now installed from a new
+    location - `OpenStack Kolla's COPR <https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang/>`_
+    compared to `Hrw's COPR <https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/>`_.