diff options
| author | Zuul <zuul@review.opendev.org> | 2023-11-18 11:40:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-11-18 11:40:10 +0000 |
| commit | d86cba116ef686a7bad6153a5ce865ba77850cc7 (patch) | |
| tree | 5cfb23eb2c1299b0127d3fac2961cc691f863b4a /tests | |
| parent | 88589df59988e750143f33031255d8c296419ab0 (diff) | |
| parent | 2ed66effa6e4a102919cb53a4b0737f852eb8674 (diff) | |
| download | kolla-d86cba116ef686a7bad6153a5ce865ba77850cc7.tar.gz kolla-d86cba116ef686a7bad6153a5ce865ba77850cc7.zip | |
Merge "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat)"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 14 |
1 files changed, 1 insertions, 13 deletions
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|" \ |