aboutsummaryrefslogtreecommitdiff
path: root/tests/templates
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2018-03-08 23:35:54 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2018-05-26 00:24:30 +0800
commit14374e715d2a5057a28126c7193cfb6270eabaab (patch)
treec3690c24b38273eb5e6a812d1eef6f32e135c2a2 /tests/templates
parent000159cb6d5da0fffe0ba73051c6c551a0cdd9bd (diff)
downloadkolla-14374e715d2a5057a28126c7193cfb6270eabaab.tar.gz
kolla-14374e715d2a5057a28126c7193cfb6270eabaab.zip
Bump Ubuntu base image to 18.04
Ubuntu 18.04 has been released. We need upgrade to it this cycle. Changes made in this patch - Bump ubuntu repo from xenial to bionic. Some repos do not have bionic packages, so still using xenial repos. - Drop mariadb, percona and nfs-ganesha repo, because these packages are already provided by Ubuntu official repo. - Since qdrouterd does not have bionic repo and xenial packages does not work on Ubuntu bionic, just add it into ignore image list. - Use python-rtslib-fb and targetcli-fb rather than python-rtslib and targetcli - use xen-utils package name rather than with package version one. - Seems unsigned repo won't work on Ubuntu bionic, stop using infra mirrored unsigned repo in gate building job. Needed-By: https://review.openstack.org/568728 Implement blueprint: ubuntu-bionic Change-Id: I4e3b0ca669cfbf6316bf591f2d8428fa1a0d6182
Diffstat (limited to 'tests/templates')
-rw-r--r--tests/templates/template_overrides.j29
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 9bc50fd0c..f925d9efc 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -63,10 +63,11 @@ RUN sed -i -e "/^mirrorlist/d" \
{% elif base_distro == "ubuntu" %}
{% endraw %}
-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
+# 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
{% raw %}
{% endif %}