diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-13 10:15:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-13 10:15:38 +0000 |
| commit | 0811df6ac03f3abe2f347f30ce8d1316b43a944f (patch) | |
| tree | cb299858dadcdbeb9f482365b3c0986cdc893f88 | |
| parent | fc572d1cda56de637c683871657c317321db2ce3 (diff) | |
| parent | ad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf (diff) | |
| download | kolla-0811df6ac03f3abe2f347f30ce8d1316b43a944f.tar.gz kolla-0811df6ac03f3abe2f347f30ce8d1316b43a944f.zip | |
Merge "CI: use Debian/Ubuntu mirrors in base image"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3001028fa..2f42ab7db 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -312,6 +312,8 @@ COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list COPY sources.list /etc/apt/sources.list.d/kolla-custom.list {% endblock %} +{% block base_debian_after_sources_list %}{% endblock %} + {% block base_ubuntu_package_apt_preferences %} COPY apt_preferences.{{ base_distro }} /etc/apt/preferences COPY apt_preferences /etc/apt/preferences.d/kolla-custom 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 %} |