diff options
| author | Zuul <zuul@review.opendev.org> | 2023-10-24 16:16:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-10-24 16:16:23 +0000 |
| commit | e77002146990c6df2c961e07e1da41440fdab122 (patch) | |
| tree | b0809b892d8b3eed4c701d8483ff2c4ba147eebe /tests | |
| parent | bd2b69e6f82a62d08f40dffd53d279d1dedbc0b5 (diff) | |
| parent | 43d50b7c8b02f78af201b012021cb55c311b4346 (diff) | |
| download | kolla-e77002146990c6df2c961e07e1da41440fdab122.tar.gz kolla-e77002146990c6df2c961e07e1da41440fdab122.zip | |
Merge "Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean""
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 14 |
1 files changed, 13 insertions, 1 deletions
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|" \ |