From de58339a0e1704ae1ade4e032a73bb4708ecfaf1 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Fri, 7 Jun 2019 12:44:30 +0200 Subject: Fix issues with Percona in Zuul and clean up a little bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Percona site has connectivity issues from OVH hosts (of Zuul). This patch makes it so that: - the internal repo is actually used - RPM GPG keys are downloaded from the actually used repo - Ubuntu mimics the RHEL behavior (i.e. the Percona repo is enabled only in the xtrabackup image) extra benefit: no need for APT preferences for Percona repo to spare MariaDB deps Change-Id: Id27831f6b404762f9e44fd6bd1c4702bf06b05f8 Signed-off-by: Radosław Piliszek --- docker/base/sources.list.ubuntu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker/base/sources.list.ubuntu') diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index f4eaa9b50..ccf1d3b1a 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -1,4 +1,4 @@ -# For non-x86 architectures we use sources.list.debian.ARCHITECTURENAME +# For non-x86 architectures we use sources.list.ubuntu. # Default repos deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse @@ -37,4 +37,5 @@ deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main # Percona XtraBackup repo -deb http://repo.percona.com/apt bionic main +# NOTE(yoctozepto): enabled only in the xtrabackup image (to spare MariaDB deps and allow Zuul override) +#deb http://repo.percona.com/apt bionic main -- cgit v1.2.3