From e6907d209b258388339b26e58a6da8cd022d1081 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 13 Mar 2020 10:27:56 -0400 Subject: [PATCH] ci: drop FAHC repo in favour of f31-coreos-continuous FAHC is super out of date now. The way to have access to newer packages is via the continuous tag, which is still manual for now, but at least targets the right Fedora release. --- ci/installdeps.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/ci/installdeps.sh b/ci/installdeps.sh index c29998e2b9..af816c11cc 100755 --- a/ci/installdeps.sh +++ b/ci/installdeps.sh @@ -10,19 +10,9 @@ if [ -n "${SKIP_INSTALLDEPS:-}" ]; then exit 0 fi -# Use the latest ostree by default (XXX: currently pulling in f29 ostree, need -# to bump rdgo to f30 or wait for packit) -id=$(. /etc/os-release && echo $ID) +# Add the continuous tag for latest build tools and mark as required. version_id=$(. /etc/os-release && echo $VERSION_ID) -if [ "$id" == fedora ] && [ "$version_id" -ge 29 ]; 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 - excludes='exclude=ostree ostree-libs ostree-grub2 rpm-ostree' - for repo in /etc/yum.repos.d/fedora*.repo; do - cat ${repo} | (while IFS= read -r line; do if echo "$line" | grep -qE -e '^enabled=1'; then echo "${excludes}"; fi; echo "$line"; done) > ${repo}.new - mv ${repo}.new ${repo} - done -fi +echo -e "[f${version_id}-coreos-continuous]\nenabled=1\nmetadata_expire=1m\nbaseurl=https://kojipkgs.fedoraproject.org/repos-dist/f${version_id}-coreos-continuous/latest/\$basearch/\ngpgcheck=0\nskip_if_unavailable=False\n" > /etc/yum.repos.d/coreos.repo pkg_upgrade # install base builddeps like @buildsys-build