From 2ed66effa6e4a102919cb53a4b0737f852eb8674 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 25 Oct 2023 10:16:14 +0200 Subject: CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat) Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/900536 Change-Id: I1bc19f8198da3f9ab2ae2a8864c3349b21b0249e --- tests/templates/template_overrides.j2 | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index cc968e290..f507cf619 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -50,15 +50,6 @@ RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \ {% endif %} {# if centos/rocky #} {% raw %} -{% 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 %} {% block base_centos_repo_overrides_post_yum -%} {%- endraw -%} @@ -113,10 +104,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|" \ -- cgit v1.2.3