From 559955d5a6598c74f85594a04684f720c168a4fc Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 20 Dec 2023 17:05:25 +0000 Subject: Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat)" This reverts commit 2ed66effa6e4a102919cb53a4b0737f852eb8674. Reason for revert: Let's use RDO trunk Change-Id: I3945fe5fd0aef2e12a7f6c60d714e69ea496083b --- tests/templates/template_overrides.j2 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index f507cf619..cc968e290 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -50,6 +50,15 @@ 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 -%} @@ -104,7 +113,10 @@ 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 + fi; \ + sed -i \ + -e "s|{{ nodepool_rdo_proxy }}|https://trunk.rdoproject.org|g" \ + /etc/yum.repos.d/delorean*.repo {% 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