From fec2c701dc36ea8d246b69290f5546bf37d414b3 Mon Sep 17 00:00:00 2001
From: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Date: Tue, 23 Jun 2020 11:34:09 +0200
Subject: Use upstream Erlang on CentOS 8

Train only.

In CentOS 8 Train we had a mix of rmq upstream and rdo packages,
erlang was from RDO and rmq (3.7) from rmq.
As this is not really tested by any other party, I propose to
unify the sources of both.

Change-Id: I52094ce9e3d98cbdedfdc23c8a43dd3093ce1771
Closes-bug: #1884034
---
 docker/base/Dockerfile.j2                 | 17 ++++++++++-------
 docker/base/rabbitmq_rabbitmq-erlang.repo |  6 ++++++
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 docker/base/rabbitmq_rabbitmq-erlang.repo

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 50b3205a5..89e0ac874 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -86,6 +86,13 @@ COPY yum.conf /etc/yum.conf
             'opendaylight.repo',
         ] %}
     {% endif %}
+    # NOTE(yoctozepto): use upstream erlang on CentOS 8
+    # see https://launchpad.net/bugs/1884034
+    {% if distro_package_manager == 'dnf' %}
+        {% set base_yum_repo_files = base_yum_repo_files + [
+            'rabbitmq_rabbitmq-erlang.repo',
+        ] %}
+    {% endif %}
 
     {% set base_yum_repo_keys = [
         'https://packages.grafana.com/gpg.key',
@@ -240,17 +247,13 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
         'HighAvailability',
         'PowerTools'
     ] %}
+    # NOTE(yoctozepto): use upstream rabbitmq (3.7) and erlang on CentOS 8
+    # see https://launchpad.net/bugs/1884034
     {% set base_centos_yum_repos_to_disable = [
+        'centos-rabbitmq-38',
         'epel',
         'epel-modular',
     ] %}
-
-    # NOTE(hrw): no rabbitmq for aarch64 in CentOS 8.0/8.1
-    {% if base_arch == 'aarch64' %}
-        {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
-            'centos-rabbitmq-38'
-        ] %}
-    {% endif %}
 {% else %}
     {% set base_centos_yum_repo_keys = base_centos_yum_repo_keys + [
         '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo
new file mode 100644
index 000000000..acd5995c8
--- /dev/null
+++ b/docker/base/rabbitmq_rabbitmq-erlang.repo
@@ -0,0 +1,6 @@
+[rabbitmq_rabbitmq-erlang]
+name=rabbitmq_rabbitmq-erlang
+baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/
+gpgcheck=1
+enabled=1
+gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
-- 
cgit v1.2.3