From dfd1e4fdaf675a8eac0ec36091869afcd1798df8 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 23 Oct 2018 19:55:10 +1100 Subject: [PATCH] Fix epel repo rewrite, add to testing It looks like epel-release switch from "mirrorlist" to "metalink" (around release 7-10 Jun 2017 according to [1]). Update our rewrite matching to handle this "metalink" as well. Add epel element to the centos7 (image-based) build for testing too [1] https://koji.fedoraproject.org/koji/buildinfo?buildID=978473 Add epel element so it's tested during the centos7 functional test. Change-Id: I2d6d4c2ec47bc69d2f16c96b5045b05c435a1af9 --- .../elements/centos7/test-elements/build-succeeds/element-deps | 1 + .../elements/epel/pre-install.d/05-rpm-epel-release | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps index 7b69c4f14..3a391e3e9 100644 --- a/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps +++ b/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps @@ -1,2 +1,3 @@ base +epel openstack-ci-mirrors diff --git a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release index 304286532..22734afa1 100755 --- a/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release +++ b/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release @@ -41,4 +41,5 @@ DIB_EPEL_MIRROR=${DIB_EPEL_MIRROR:-} [ -n "$DIB_EPEL_MIRROR" ] || exit 0 # Set the EPEL mirror to use -sed -e "s|^#baseurl=http://download.fedoraproject.org/pub/epel|baseurl=$DIB_EPEL_MIRROR|;/^mirrorlist=/d" -i /etc/yum.repos.d/epel.repo +sed -e "s|^#baseurl=http://download.fedoraproject.org/pub/epel|baseurl=$DIB_EPEL_MIRROR|;/^mirrorlist=/d;/^metalink=/d" -i /etc/yum.repos.d/epel.repo +