From c91108a1519a0f4c6f82d9da8df765fcc52cd689 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Wed, 3 Sep 2025 16:07:01 +0200 Subject: [PATCH] [stable] Use versioned Erlang 26 and 27 repo on aarch64 In stable branches we need both Erlang 26.2 (RabbitMQ 3.13) and Erlang 27 (RabbitMQ 4.1). Follows [1], adapted for stable branches where both versions are required. [1] https://review.opendev.org/c/openstack/kolla/+/959135 Change-Id: Ied94e0fac36e60cbf227eb9105f659adc1500545 Signed-off-by: Bartosz Bezak (cherry picked from commit 688c3c7ed898684b2ce9f729198642fb38ab2f13) --- doc/source/contributor/versions.rst | 2 +- docker/base/Dockerfile.j2 | 3 ++- ...bitmq-erlang.repo => copr-rabbitmq-erlang-26.repo} | 8 ++++---- docker/base/copr-rabbitmq-erlang-27.repo | 11 +++++++++++ kolla/template/repos.yaml | 6 ++++-- .../erlang-aarch64-versioned-repos-9b1d2c8b8b7a.yaml | 5 +++++ 6 files changed, 27 insertions(+), 8 deletions(-) rename docker/base/{copr-rabbitmq-erlang.repo => copr-rabbitmq-erlang-26.repo} (65%) create mode 100644 docker/base/copr-rabbitmq-erlang-27.repo create mode 100644 releasenotes/notes/erlang-aarch64-versioned-repos-9b1d2c8b8b7a.yaml diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst index 81ea0d918f..a7f237777e 100644 --- a/doc/source/contributor/versions.rst +++ b/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/ diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index dd76637187..dd3fab2955 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -75,7 +75,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', ] %} {# diff --git a/docker/base/copr-rabbitmq-erlang.repo b/docker/base/copr-rabbitmq-erlang-26.repo similarity index 65% rename from docker/base/copr-rabbitmq-erlang.repo rename to docker/base/copr-rabbitmq-erlang-26.repo index 17df94d9d0..168748bb30 100644 --- a/docker/base/copr-rabbitmq-erlang.repo +++ b/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 diff --git a/docker/base/copr-rabbitmq-erlang-27.repo b/docker/base/copr-rabbitmq-erlang-27.repo new file mode 100644 index 0000000000..a146d604d2 --- /dev/null +++ b/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 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index b0da85c595..6606b802c5 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -21,7 +21,8 @@ centos-aarch64: ceph: "centos-ceph-reef" crb: "crb" 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" @@ -167,7 +168,8 @@ rocky-aarch64: ceph: "centos-ceph-reef" crb: "crb" 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" diff --git a/releasenotes/notes/erlang-aarch64-versioned-repos-9b1d2c8b8b7a.yaml b/releasenotes/notes/erlang-aarch64-versioned-repos-9b1d2c8b8b7a.yaml new file mode 100644 index 0000000000..e535af4cfd --- /dev/null +++ b/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.