diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-03-09 17:44:54 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-04-15 09:32:06 +0000 |
| commit | 53443c5c712f4ec23b859105e94bcd90abc27762 (patch) | |
| tree | 5bc6d8db4c65519e16d231b55f574e813e29da4b /tests | |
| parent | a176c6e080be2e71829e8ca5e8b330fdda70038a (diff) | |
| download | kolla-53443c5c712f4ec23b859105e94bcd90abc27762.tar.gz kolla-53443c5c712f4ec23b859105e94bcd90abc27762.zip | |
Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images
so there is no need for checking which Python version (2.x or 3.x) is
used inside of containers.
We also no longer have to support yum as a value for
distro_package_manager.
Partially-Implements: blueprint centos-rhel-8
Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index d7ea2dcb9..8de37a66a 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -31,35 +31,12 @@ RUN sed -i \ -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \ /etc/yum.repos.d/CentOS-*.repo {% raw %} -{% if distro_package_manager == 'yum' %} -{% endraw %} -# FIXME(mgoddard): No crmsh or opendaylight CentOS 8 repos yet. -RUN sed -i \ - -e "s|http://download.opensuse.org|http://{{ nodepool_mirror_host }}/opensuse|" \ - /etc/yum.repos.d/crmsh.repo \ - && sed -i \ - -e "s|https://cbs.centos.org/repos|{{ nodepool_cbs_centos_proxy }}|g" \ - /etc/yum.repos.d/opendaylight.repo -{% raw %} -{% endif %} -{% endraw %} - -{% raw %} {% endblock %} {% block base_centos_repo_overrides_post_rpm %} {% endraw %} -{% raw %} -{% if distro_package_manager == 'yum' %} -{% endraw %} # FIXME(mgoddard): No CentOS8 RDO repos mirrored yet. -RUN sed -i \ - -e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \ - /etc/yum.repos.d/delorean*.repo -{% raw %} -{% endif %} -{% endraw %} {% raw %} {% endblock %} |
