From 7f56a194ecc609b42c49e4e55a84ae4ab3f01b06 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 22 Jun 2023 00:09:33 +0200 Subject: [PATCH] fmf: Avoid dnf --noautoremove This option got dropped in dnf 5, and thus this started to fail on Rawhide. See https://bugzilla.redhat.com/show_bug.cgi?id=2216622 --- test/browser/browser.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/browser/browser.sh b/test/browser/browser.sh index d854d18fa16d..2346f27345c7 100755 --- a/test/browser/browser.sh +++ b/test/browser/browser.sh @@ -34,7 +34,11 @@ fi # HACK: setroubleshoot-server crashes/times out randomly (breaking TestServices), # and is hard to disable as it does not use systemd if rpm -q setroubleshoot-server; then - dnf remove -y --noautoremove setroubleshoot-server + # HACK: we want this: dnf remove -y --noautoremove setroubleshoot-server + # but dnf5 broke it: https://bugzilla.redhat.com/show_bug.cgi?id=2216622 + rpm -e --verbose cockpit-selinux || true + rpm -e --verbose setroubleshoot-plugins || true + rpm -e --verbose setroubleshoot-server fi if grep -q 'ID=.*fedora' /etc/os-release && [ "$PLAN" = "basic" ]; then