From 4be0329f8e3e209b5d92fa5e21941ba73425b4d9 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 30 Oct 2023 17:36:36 +0100 Subject: [PATCH] fmf: Hack around Testing Farm's tag-repository priority TF runs add the Fedora tag repository with `priority=9`. This breaks upstream reverse dependency tests, as that repository will then win over our "main builds" COPR and thus run tests against mismatching cockpit-* rpms. Counter the hack by dropping the tag repo priority and upgrading all cockpit packages. --- test/browser/browser.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/browser/browser.sh b/test/browser/browser.sh index d3e361aa8a42..60cab99e8563 100755 --- a/test/browser/browser.sh +++ b/test/browser/browser.sh @@ -48,6 +48,14 @@ if grep -q 'ID=.*rhel' /etc/os-release; then dnf install -y kpatch kpatch-dnf fi +# HACK: TF prioritizes Fedora tag repo over all others, in particular our daily COPR for revdep tests +# This is bad -- let the highest version win instead! +# https://gitlab.com/testing-farm/infrastructure/-/blob/testing-farm/ranch/public/citool-config/guest-setup/pre-artifact-installation/templates/tag.repo.j2?ref_type=heads +for f in $(grep -l -r 'testing-farm-tag-repository' /etc/yum.repos.d); do + sed -i '/priority/d' "$f" +done +dnf update -y 'cockpit*' + # RHEL 8 does not build cockpit-tests; when dropping RHEL 8 support, move to test/browser/main.fmf if [ "$PLAN" = basic ] && ! grep -q el8 /etc/os-release; then dnf install -y cockpit-tests