From d4b777bb060517dbb0b648d5d7d5c07336969866 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 5 Aug 2025 14:24:11 +0200 Subject: Move to Rocky Linux 10 Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/961237 Change-Id: Idd809f5efd2d308c1565d7635e67af0a431d18f7 Signed-off-by: Michal Nasiadka --- tests/templates/template_overrides.j2 | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'tests') diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 8dfc6a9ff..003e8005b 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -19,29 +19,14 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \ {% endraw %} {% if base_distro == 'rocky' %} -{# -NOTE(hrw): Rocky is not mirrored but it uses CentOS repos which are - #} {% raw %} {% block base_centos_repo_overrides_post_copy %} {% endraw %} - -COPY ci-rocky.repo /etc/yum.repos.d/ -RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \ - && sed -i -e "s/MIRROR/{{ nodepool_mirror_host }}/g" /etc/yum.repos.d/ci-rocky.repo - +RUN sed -i -e "s/^mirrorlist/#mirrorlist/g" -e "s/^#baseurl/baseurl/g" \ + /etc/yum.repos.d/rocky.repo {% raw %} {% endblock %} {% endraw %} - -{% raw %} - -{% block base_centos_repo_overrides_post_yum -%} -{%- endraw -%} - && cd /etc/yum.repos.d/ && mv CentOS*.repo epel*.repo not-for-ci/ -{%- raw -%} -{% endblock %} -{% endraw %} {% endif %} {% raw %} -- cgit v1.2.3