From 3db029c8bf001a4d3bcd5be1c1b35c736013f32e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 8 Mar 2022 15:06:07 +0000 Subject: CentOS Stream 8: drop CentOS RabbitMQ 3.8 repo We need 3.7 in Train in order to handle the transition from CentOS 7 to 8. The RabbitMQ image ends up with 3.7.28, but for certainty, this change removes the CentOS RabbitMQ 3.8 repository that was added with the switch to Delorean for CentOS Stream 8. Change-Id: I120be2b28a7214e6b03976719319e4208d8050ab --- docker/base/Dockerfile.j2 | 1 - docker/base/delorean-deps.repo | 8 -------- 2 files changed, 9 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index e96005a2d..03522b428 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -252,7 +252,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 # 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', ] %} diff --git a/docker/base/delorean-deps.repo b/docker/base/delorean-deps.repo index ffc53dd10..37c094a4f 100644 --- a/docker/base/delorean-deps.repo +++ b/docker/base/delorean-deps.repo @@ -13,11 +13,3 @@ baseurl=https://trunk.rdoproject.org/centos8-train/build-deps/latest/ enabled=1 gpgcheck=0 module_hotfixes=1 - -[centos-rabbitmq-38] -name=Messaging RabbitMQ -baseurl=http://mirror.centos.org/centos/8-stream/messaging/$basearch/rabbitmq-38 -gpgcheck=0 -enabled=1 -module_hotfixes=1 -skip_if_unavailable=1 -- cgit v1.2.3