From 14374e715d2a5057a28126c7193cfb6270eabaab Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 8 Mar 2018 23:35:54 +0800 Subject: 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 --- docker/base/sources.list.ubuntu | 22 +++++----------------- docker/base/sources.list.ubuntu.aarch64 | 8 ++++---- docker/base/sources.list.ubuntu.ppc64le | 11 ++++------- 3 files changed, 13 insertions(+), 28 deletions(-) (limited to 'docker/base') diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index fab757f25..3025ed444 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -1,41 +1,29 @@ # For non-x86 architectures we use sources.list.debian.ARCHITECTURENAME # Default repos -deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse # Backports have a lower priority and must be explicitly installed to be used -deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main -# MariaDB 10.0 repo -deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main - -# Percona repo (for xtrabackup) -deb http://repo.percona.com/apt xenial main - # Elastic repo deb https://packages.elastic.co/elasticsearch/2.x/debian stable main # Kibana repo deb https://packages.elastic.co/kibana/4.6/debian stable main -# Docker repo -deb http://apt.dockerproject.org/repo ubuntu-xenial main - # InfluxDB repo -deb https://repos.influxdata.com/ubuntu xenial stable +deb https://repos.influxdata.com/ubuntu bionic stable # Grafana repo deb https://packagecloud.io/grafana/stable/debian/ jessie main -# Nfs-ganesha repo -deb http://download.ceph.com/nfs-ganesha/deb-V2.5-stable/luminous xenial main - # Fluentd repo deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index dc76db0dc..a6a1f4e45 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -1,10 +1,10 @@ # Default repos -deb http://ports.ubuntu.com/ xenial main restricted universe multiverse -deb http://ports.ubuntu.com/ xenial-updates main restricted universe multiverse -deb http://ports.ubuntu.com/ xenial-security main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-updates main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-security main restricted universe multiverse # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. diff --git a/docker/base/sources.list.ubuntu.ppc64le b/docker/base/sources.list.ubuntu.ppc64le index dab6bcdec..a6a1f4e45 100644 --- a/docker/base/sources.list.ubuntu.ppc64le +++ b/docker/base/sources.list.ubuntu.ppc64le @@ -1,14 +1,11 @@ # Default repos -deb http://ports.ubuntu.com/ xenial main restricted universe multiverse -deb http://ports.ubuntu.com/ xenial-updates main restricted universe multiverse -deb http://ports.ubuntu.com/ xenial-security main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-updates main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-security main restricted universe multiverse # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse +deb http://ports.ubuntu.com/ bionic-backports main restricted universe multiverse # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/queens main - -# Mariadb -deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main -- cgit v1.2.3