Merge pull request #468 from stackhpc/upstream/2024.1-2025-09-08

Synchronise 2024.1 with upstream

Author: priteau

doc/source/contributor/versions.rst

@@ -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
-.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang/
+.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang-26/
 
 .. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss
 .. _`MariaDB Community downloads`: https://mariadb.com/downloads/community/

docker/base/Dockerfile.j2

@@ -77,7 +77,8 @@ COPY dnf.conf /etc/dnf/dnf.conf
 
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = base_yum_repo_files + [
-        'copr-rabbitmq-erlang.repo',
+        'copr-rabbitmq-erlang-26.repo',
+        'copr-rabbitmq-erlang-27.repo',
     ] %}
 
 {#

docker/base/copr-rabbitmq-erlang.repo renamed to docker/base/copr-rabbitmq-erlang-26.repo

@@ -2,10 +2,10 @@
 # from https://github.com/rabbitmq/erlang-rpm/
 # Thanks to COPR we have aarch64 packages for Rocky Linux
 
-[copr-rabbitmq-erlang]
-name=openstack-kolla COPR with Erlang build for RabbitMQ
-baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/rhel-$releasever-aarch64/
+[copr-rabbitmq-erlang-26]
+name=openstack-kolla COPR with Erlang 26 build for RabbitMQ
+baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-26/rhel-$releasever-aarch64/
 gpgcheck=1
 enabled=0
-gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/pubkey.gpg
+gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-26/pubkey.gpg
 repo_gpgcheck=0

docker/base/copr-rabbitmq-erlang-27.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 Rocky Linux
+
+[copr-rabbitmq-erlang-27]
+name=openstack-kolla COPR with Erlang 27 build for RabbitMQ
+baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/rhel-$releasever-aarch64/
+gpgcheck=1
+enabled=0
+gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/pubkey.gpg
+repo_gpgcheck=0

kolla/template/repos.yaml

@@ -23,7 +23,8 @@ centos-aarch64:
   crb: "crb"
   docker-ce: "docker-ce"
   epel: "epel"
-  erlang: "copr-rabbitmq-erlang"
+  erlang-26: "copr-rabbitmq-erlang-26"
+  erlang-27: "copr-rabbitmq-erlang-27"
   extras: "extras"
   fluentd: "fluent-package-lts"
   grafana: "grafana"
@@ -181,7 +182,8 @@ rocky-aarch64:
   crb: "crb"
   docker-ce: "docker-ce"
   epel: "epel"
-  erlang: "copr-rabbitmq-erlang"
+  erlang-26: "copr-rabbitmq-erlang-26"
+  erlang-27: "copr-rabbitmq-erlang-27"
   extras: "extras"
   fluentd: "fluent-package-lts"
   grafana: "grafana"

releasenotes/notes/erlang-aarch64-versioned-repos-9b1d2c8b8b7a.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Switches Erlang RPMs on aarch64 to a versioned Erlang 26 or 27 repository,
+    due to Fedora COPR not supporting multiple package versions in one repo.