openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix epel repo rewrite, add to testing"

This commit is contained in:
Zuul 2018-10-28 23:41:21 +00:00 committed by Gerrit Code Review
parent 6d3d830cab dfd1e4fdaf
commit 1785bd3975
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps
View File

@ -1,2 +1,3 @@
base
epel
openstack-ci-mirrors

3
diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
View File

@ -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