diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-08-10 09:04:50 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-10-05 09:57:38 +0000 |
| commit | 43d50b7c8b02f78af201b012021cb55c311b4346 (patch) | |
| tree | 0b1cf23b297531e889219c8237f440278a0eb515 /tests | |
| parent | 050418a2d41dbb88f0f8a02070f5978028bf829d (diff) | |
| download | kolla-43d50b7c8b02f78af201b012021cb55c311b4346.tar.gz kolla-43d50b7c8b02f78af201b012021cb55c311b4346.zip | |
Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean"
This reverts commit 881e3925c7aa8c3bbe6897ea8790f109dc0a7fb8.
Reason for revert: switch back to master, to be followed by switch to bobcat when available
Change-Id: Ib8fdad41a669fc8404b8de2de5361db9547c4ea2
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|" \ |