From d25588722b0b0d512f2a029fc3d0484bbfd66f35 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 5 Apr 2018 10:51:23 -0400 Subject: [PATCH] ci: Ensure we exclude ostree from base fedora too rdgo uses an earlier git tag due to branches, until we have proper repo priorities that don't care about versions, let's do this hack. Same thing as https://pagure.io/fedora-atomic-host-continuous/c/a7145410fbc7e73188fde449628fa0343b05e4a4?branch=master Closes: #1326 Approved by: jlebon --- ci/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/build.sh b/ci/build.sh index 084db9a5..3f2e8b2b 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -12,7 +12,11 @@ version_id=$(. /etc/os-release && echo $VERSION_ID) if [ "$id" == fedora ] && [ "$version_id" == 27 ]; then echo -e '[fahc]\nmetadata_expire=1m\nbaseurl=https://ci.centos.org/artifacts/sig-atomic/fahc/rdgo/build/\ngpgcheck=0\n' > /etc/yum.repos.d/fahc.repo # Until we fix https://github.com/rpm-software-management/libdnf/pull/149 - sed -i -e 's,metadata_expire=6h,exclude=ostree ostree-devel ostree-libs ostree-grub2\nmetadata_expire=6h,' /etc/yum.repos.d/fedora-updates.repo + excludes='exclude=ostree ostree-libs ostree-grub2 rpm-ostree' + for repo in /etc/yum.repos.d/fedora*.repo; do + cat ${repo} | (while read line; do if echo "$line" | grep -qE -e '^enabled=1'; then echo "${excludes}"; fi; echo $line; done) > ${repo}.new + mv ${repo}.new ${repo} + done elif [ "$id" == centos ]; then echo -e '[cahc]\nmetdata_expire=1m\nbaseurl=https://ci.centos.org/artifacts/sig-atomic/rdgo/centos-continuous/build\ngpgcheck=0\n' > /etc/yum.repos.d/cahc.repo fi