Skip to content

Commit

Permalink
fmf: Fix installation of our main-builds COPR
Browse files Browse the repository at this point in the history
Commit 5ab52df was not sufficient: The problem wasn't the tag
repository, but that current Fedora rawhide has a 83-3 rebuild of
cockpit-podman which is formally newer than our 83-1.<git stamp>
revisions from our main-builds COPR.

If the env has a main-builds COPR (for reverse dependency tests), we
always want to install the latest version from that. So give it the
highest priority (uninutitively, lower priority wins), and use
`distro-sync` to up- or downgrade the package as necessary, and consider
*only* the COPR.

Similar to cockpit-project/cockpit@7ab102a551
  • Loading branch information
martinpitt committed Jan 31, 2024
1 parent 3e5c585 commit 4e25158
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions test/browser/browser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ fi
# HACK: ensure that critical components are up to date: https://github.com/psss/tmt/issues/682
dnf update -y podman crun conmon criu

# 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-podman
# if we run during cross-project testing against our main-builds COPR, then let that win
# even if Fedora has a newer revision
main_builds_repo="$(ls /etc/yum.repos.d/*cockpit*main-builds* 2>/dev/null || true)"
if [ -n "$main_builds_repo" ]; then
echo 'priority=0' >> "$main_builds_repo"
dnf distro-sync -y --repo 'copr*' cockpit-podman
fi

# Show critical package versions
rpm -q runc crun podman criu kernel-core selinux-policy cockpit-podman cockpit-bridge || true
Expand Down

0 comments on commit 4e25158

Please sign in to comment.