Skip to content

Commit

Permalink
fmf: Uninstall cockpit-packagekit for basic and network plans
Browse files Browse the repository at this point in the history
These plans are not meant to have cockpit-packagekit installed. That
isn't in the test dependency list, but dnf installs "missing" weak
dependencies on upgrades by default, which is undesired: The packagekit
page gets preloaded and thus influences the test outcome, particularly
when it is an old version (as happens during downstream gating).

So remove the package again if it got installed for plans other than
"optional" (which is the one that actually tests packagekit).

Fixes https://gitlab.com/redhat/centos-stream/rpms/cockpit/-/merge_requests/68
  • Loading branch information
martinpitt committed Nov 2, 2023
1 parent 3feabf9 commit c8720ed
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions test/browser/browser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ if grep -q 'ID=.*fedora' /etc/os-release && [ "$PLAN" = "basic" ]; then
dnf install -y abrt abrt-addon-ccpp reportd libreport-plugin-bugzilla libreport-fedora
fi

# dnf installs "missing" weak dependencies, but we don't want them for plans other than "optional"
if [ "$PLAN" != "optional" ] && rpm -q cockpit-packagekit; then
dnf remove -y cockpit-packagekit
fi

if grep -q 'ID=.*rhel' /etc/os-release; then
# required by TestUpdates.testKpatch, but kpatch is only in RHEL
dnf install -y kpatch kpatch-dnf
Expand Down

0 comments on commit c8720ed

Please sign in to comment.