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/apt_preferences.ubuntu | 5 ----- 1 file changed, 5 deletions(-) (limited to 'docker/base/apt_preferences.ubuntu') diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 5cfd43a82..ef989aab3 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -2,8 +2,3 @@ Package: ceph* *cephfs* librbd* *rados* python*-rbd librgw* python*-rados python*-ceph* python*-rgw Pin: version 13.* Pin-Priority: -1 - -# Lower the priority of packages from Percona's repos -Package: * -Pin: origin repo.percona.com -Pin-Priority: 100 -- cgit v1.2.3