diff options
| author | Zuul <zuul@review.opendev.org> | 2025-07-17 11:54:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-07-17 11:54:34 +0000 |
| commit | 5d2dfc0eb9fac7d22a04665173fe650b61985d19 (patch) | |
| tree | 8962ae2c35df1ae753ccaa14e1084e73e02dda66 /tests | |
| parent | ba2b4bb56415b9bd7b690dcf077bb59cf4083f05 (diff) | |
| parent | 9e36b8976657e5aaf285f4ab9f65603ab475fd89 (diff) | |
| download | kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.tar.gz kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.zip | |
Merge "Move to CentOS Stream 10"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index cc968e290..9ab0f16fb 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -18,21 +18,7 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \ {% endblock %} {% endraw %} -{% if base_distro in ['centos', 'rocky'] %} - {% if base_distro == 'centos' %} - -{% raw %} -{% block base_centos_repo_overrides_post_copy %} -{% endraw %} - -COPY ci-centos.repo /etc/yum.repos.d/ -RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ && mv centos*.repo not-for-ci/ \ - && sed -i -e "s/MIRROR/{{ nodepool_mirror_host }}/g" /etc/yum.repos.d/ci-centos.repo - -{% raw %} -{% endblock %} -{% endraw %} - {% elif base_distro == 'rocky' %} +{% if base_distro == 'rocky' %} {# NOTE(hrw): Rocky is not mirrored but it uses CentOS repos which are #} @@ -47,7 +33,6 @@ RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \ {% raw %} {% endblock %} {% endraw %} - {% endif %} {# if centos/rocky #} {% raw %} {% block base_centos_repo_overrides_post_rpm %} |