From 881e3925c7aa8c3bbe6897ea8790f109dc0a7fb8 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 8 May 2023 13:27:44 +0200 Subject: CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean Antelope was released, landed in CentOS repo, time to use it. Change-Id: I9fa8fd5dd9b75251363f1957d1e249e7cb4beb84 --- 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 7318556cd..7ba7b4852 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 -%} @@ -114,10 +105,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