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/Dockerfile.j2 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'docker/base/Dockerfile.j2') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b61a6a989..fda528330 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -64,10 +64,6 @@ COPY yum.conf /etc/yum.conf #### BEGIN REPO ENABLEMENT -# Workaround https://bugs.launchpad.net/kolla/+bug/1813906 -# https://jira.percona.com/browse/PT-1685 -COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY - {% set base_yum_repo_files = [ ] %} @@ -90,13 +86,12 @@ COPY gpg-keys/PERCONA-PACKAGING-KEY /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY 'td.repo' ] %} + ## NOTE(yoctozepto): Percona keys omitted on purpose (handled via the repo file for compatibility with Zuul) {% set base_yum_repo_keys = [ 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', 'https://packages.grafana.com/gpg.key', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', - 'https://www.percona.com/downloads/RPM-GPG-KEY-percona', - '/etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY', 'https://packages.treasuredata.com/GPG-KEY-td-agent' ] %} {% elif base_arch == 'aarch64' %} -- cgit v1.2.3