From 9e36b8976657e5aaf285f4ab9f65603ab475fd89 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 20 May 2025 09:21:59 +0000 Subject: Move to CentOS Stream 10 Known missing packages: - mod_auth_mellon - missing SAML support in Keystone/Horizon - built in Kolla COPR - glusterfs-fuse in manila-share - built in Kolla COPR - collectd/telegraf - no opstools repository - redis - needs a switch to valkey - python3-ethtool - not required for neutron-mlnx-agent since 6 years [1] Building packages in Kolla COPR is a temporary solution until these show up in EPEL10. [1]: Id2cae3ac9ff049e9fc8225551f99e1e99a87fc65 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/951751 Change-Id: I7074fabcf95184fcfd2561648ae1e05acfb0bc11 Signed-off-by: Michal Nasiadka --- tests/templates/template_overrides.j2 | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'tests') diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index cc968e290..9ab0f16fb 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -18,21 +18,7 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \ {% endblock %} {% endraw %} -{% if base_distro in ['centos', 'rocky'] %} - {% if base_distro == 'centos' %} - -{% raw %} -{% block base_centos_repo_overrides_post_copy %} -{% endraw %} - -COPY ci-centos.repo /etc/yum.repos.d/ -RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ && mv centos*.repo not-for-ci/ \ - && sed -i -e "s/MIRROR/{{ nodepool_mirror_host }}/g" /etc/yum.repos.d/ci-centos.repo - -{% raw %} -{% endblock %} -{% endraw %} - {% elif base_distro == 'rocky' %} +{% if base_distro == 'rocky' %} {# NOTE(hrw): Rocky is not mirrored but it uses CentOS repos which are #} @@ -47,7 +33,6 @@ RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \ {% raw %} {% endblock %} {% endraw %} - {% endif %} {# if centos/rocky #} {% raw %} {% block base_centos_repo_overrides_post_rpm %} -- cgit v1.2.3