diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-10 16:45:13 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-10 15:57:15 +0000 |
| commit | ad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf (patch) | |
| tree | bd8191ef056d9fe5c4af71671d61489fd52609e0 /tests | |
| parent | 2cf3f2309a2a774f65d403b90d1950cab001863f (diff) | |
| download | kolla-ad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf.tar.gz kolla-ad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf.zip | |
CI: use Debian/Ubuntu mirrors in base image
So far we built 'base' image using upstream mirrors and then replaced
them with OpenStack infra ones. Let do that right after we copy own
APT sources.list file.
Change-Id: Icb745f628c1c50d9f20df022b08ddc46fccc270c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/templates/template_overrides.j2 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index b77031876..515ae63ce 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -63,15 +63,13 @@ RUN sed -i \ {% raw %} {% endblock %} -{% block base_footer %} -## TODO(yoctozepto): replace base repo earlier as well (like RHEL-based do) +{% block base_debian_after_sources_list %} {% if base_distro == "debian" %} {% endraw %} RUN sed -i -e "s|http://deb.debian.org|http://{{ nodepool_mirror_host }}|" \ -e "s|http://security.debian.org|http://{{ nodepool_mirror_host }}|" \ - /etc/apt/sources.list \ - && apt-get update + /etc/apt/sources.list {% raw %} {% elif base_distro == "ubuntu" %} @@ -79,8 +77,7 @@ RUN sed -i -e "s|http://deb.debian.org|http://{{ nodepool_mirror_host }}|" \ RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \ -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \ - /etc/apt/sources.list \ - && apt-get update + /etc/apt/sources.list {% raw %} {% endif %} |