diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-06-07 12:53:51 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-06-07 15:55:58 +0000 |
| commit | 5859180c2c78c62defca37446722b5f15fdbefb7 (patch) | |
| tree | b4e9da8946d54afe39c376bb3be3d3fd337d80af | |
| parent | 9cfd3a88aa1c07054b66495dbb069a0000a20738 (diff) | |
| download | kolla-5859180c2c78c62defca37446722b5f15fdbefb7.tar.gz kolla-5859180c2c78c62defca37446722b5f15fdbefb7.zip | |
Debian/Ubuntu: allow to use unsigned repositories
When we run Debian 'buster' or Ubuntu 18.04 in CI job they refuse to
work as infra mirror is not signed.
This patch instructs APT to use unsigned repos anyway.
Change-Id: I530fde5b57894afda2de98d7c217e735497e3feb
| -rw-r--r-- | tests/templates/template_overrides.j2 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index e8aca54e7..f845f571e 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -14,7 +14,10 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \ {% raw %} {% if base_distro == 'ubuntu' %} -RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow-unauthenticated +# NOTE(hrw): Debian 'buster' and Ubuntu 18.04 refuse to use unsigned repos +RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow-unauthenticated \ + && echo 'Acquire::AllowInsecureRepositories "true";' > /etc/apt/apt.conf.d/99allow-insecure-repos + {% elif base_distro == 'centos' %} {% endraw %} @@ -69,11 +72,10 @@ RUN sed -i -e "/^mirrorlist/d" \ {% elif base_distro == "ubuntu" %} {% endraw %} -# FIXME(jeffrey4l): seems we can not use unsigned repo in ubuntu 18.04 -#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 +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 {% raw %} {% endif %} |