From adaef5768c527677e5fc62e3173c9af7699e16bf Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 8 May 2024 13:58:11 +0200 Subject: [PATCH] [2024.1 only] switch rpm distros to Cloud SIG Caracal repos Change-Id: Ibf4d24657f246a191a4b4c1ab95b47d6873e468a --- docker/base/Dockerfile.j2 | 13 +------------ docker/base/ci-centos.repo | 8 ++++++++ docker/base/ci-rocky.repo | 8 ++++++++ kolla/common/config.py | 6 +----- tests/templates/template_overrides.j2 | 9 +-------- 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fe91ca6a6c..69ece42d22 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -132,6 +132,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ {% set base_centos_yum_repo_packages = [ 'centos-release-ceph-reef', 'centos-release-nfv-openvswitch', + 'centos-release-openstack-caracal', 'centos-release-opstools', 'epel-release', ] %} @@ -150,24 +151,12 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-ceph-reef', 'centos-nfv-openvswitch', 'centos-opstools', - '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 a8decf252b..502105e9f5 100644 --- a/docker/base/ci-centos.repo +++ b/docker/base/ci-centos.repo @@ -53,6 +53,14 @@ enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV module_hotfixes=1 +[centos-openstack-caracal] +name=(OpenDev mirror) CentOS-$releasever - OpenStack Caracal +baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-caracal/ +gpgcheck=1 +enabled=1 +gpgkey=https://www.centos.org/keys/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 3daf5c5ba6..efb68c0396 100644 --- a/docker/base/ci-rocky.repo +++ b/docker/base/ci-rocky.repo @@ -13,6 +13,14 @@ enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV module_hotfixes=1 +[centos-openstack-caracal] +name=(OpenDev mirror) CentOS-$releasever - OpenStack Caracal +baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-caracal/ +gpgcheck=1 +enabled=1 +gpgkey=https://www.centos.org/keys/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/kolla/common/config.py b/kolla/common/config.py index 1024cf1bd6..fac7639109 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -39,10 +39,6 @@ DISTRO_PRETTY_NAME = { } OPENSTACK_RELEASE = '2024.1' -# This is noarch repository so we will use it on all architectures -DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-caracal/" \ - "delorean-deps.repo" - # TODO(mandre) check for file integrity instead of downloading from an HTTPS # source TARBALLS_BASE = "https://tarballs.opendev.org" @@ -281,7 +277,7 @@ _BASE_OPTS = [ help=('Set the package type of the distro. If not set then ' 'the packaging type is set to "rpm" if a RHEL based ' 'distro and "deb" if a Debian based distro.')), - cfg.ListOpt('rpm_setup_config', default=[DELOREAN_DEPS], + cfg.ListOpt('rpm_setup_config', default=[], help=('Comma separated list of .rpm or .repo file(s) ' 'or URL(s) to install before building containers')), cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')), diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index cc968e2902..cd892dc9ae 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -53,10 +53,6 @@ RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \ {% block base_centos_repo_overrides_post_rpm %} {% endraw %} -RUN sed -i \ - -e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \ - /etc/yum.repos.d/delorean*.repo - {% raw %} {% endblock %} @@ -113,10 +109,7 @@ RUN if [ -d /etc/yum.repos.d/not-for-ci/ ]; then \ rm ci-{{ base_distro }}.repo && \ mv not-for-ci/*.repo . && \ rm -rf not-for-ci; \ - fi; \ - sed -i \ - -e "s|{{ nodepool_rdo_proxy }}|https://trunk.rdoproject.org|g" \ - /etc/yum.repos.d/delorean*.repo + fi; {% elif base_distro == "debian" %} RUN sed -i -e "s|\[trusted=yes\] http://{{ nodepool_mirror_host }}|http://deb.debian.org|" \ -e "s|\[trusted=yes\] http://{{ nodepool_mirror_host }}|http://security.debian.org|" \