From 559955d5a6598c74f85594a04684f720c168a4fc Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 20 Dec 2023 17:05:25 +0000
Subject: Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean
 (Bobcat)"

This reverts commit 2ed66effa6e4a102919cb53a4b0737f852eb8674.

Reason for revert: Let's use RDO trunk

Change-Id: I3945fe5fd0aef2e12a7f6c60d714e69ea496083b
---
 docker/base/Dockerfile.j2  | 16 ++++++++++++++--
 docker/base/ci-centos.repo |  8 --------
 docker/base/ci-rocky.repo  |  8 --------
 3 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'docker')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 0bfebc81b..fa37d05ba 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -130,7 +130,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 ] %}
 
 {% set base_centos_yum_repo_packages = [
-    'centos-release-openstack-bobcat',
+    'centos-release-ceph-quincy',
+    'centos-release-nfv-openvswitch',
     'centos-release-opstools',
     'epel-release',
 ] %}
@@ -149,13 +150,24 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
     'centos-ceph-quincy',
     'centos-nfv-openvswitch',
     'centos-opstools',
-    'centos-rabbitmq-38',
+    'centos9-nfv-ovs',
+    'centos9-opstools',
+    'centos9-rabbitmq',
+    'centos9-storage',
     'epel',
     'influxdb',
     'opensearch-2.x',
     'opensearch-dashboards-2.x',
 ] %}
 
+{% if base_arch == 'aarch64' %}
+
+{# NOTE(hrw): delorean-deps.repo may force x86-64 repos #}
+
+RUN sed -i -e "s/x86_64/aarch64/g" /etc/yum.repos.d/delorean-deps.repo
+
+{% endif %}
+
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
 
 {%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
diff --git a/docker/base/ci-centos.repo b/docker/base/ci-centos.repo
index e15954a9d..356cb9edc 100644
--- a/docker/base/ci-centos.repo
+++ b/docker/base/ci-centos.repo
@@ -53,14 +53,6 @@ enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
 module_hotfixes=1
 
-[centos-openstack-bobcat]
-name=(OpenDev mirror) CentOS-$releasever - OpenStack Bobcat
-baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-bobcat/
-gpgcheck=1
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
-module_hotfixes=1
-
 [centos-opstools]
 name=(OpenDev mirror) CentOS Stream $releasever - OpsTools - collectd
 baseurl=http://MIRROR/centos-stream/SIGs/$stream/opstools/$basearch/collectd-5/
diff --git a/docker/base/ci-rocky.repo b/docker/base/ci-rocky.repo
index 76fa85efc..e04f4cd8d 100644
--- a/docker/base/ci-rocky.repo
+++ b/docker/base/ci-rocky.repo
@@ -13,14 +13,6 @@ enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
 module_hotfixes=1
 
-[centos-openstack-bobcat]
-name=(OpenDev mirror) CentOS-$releasever - OpenStack Bobcat
-baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-bobcat/
-gpgcheck=1
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
-module_hotfixes=1
-
 [centos-opstools]
 name=(OpenDev mirror) CentOS Stream $releasever - OpsTools - collectd
 baseurl=http://MIRROR/centos-stream/SIGs/$stream/opstools/$basearch/collectd-5/
-- 
cgit v1.2.3