Skip to content

Commit

Permalink
fmf: Fix bogus /dev/sda* → nvme* symlinks on TF machines
Browse files Browse the repository at this point in the history
Rawhide Testing Farm machines started to get a set of symlinks like
/dev/sda1 -> nvme0n1 (but *no* /dev/sda), via amazon-ec2-utils
(amazonlinux/amazon-ec2-utils#37).

They break `scsi_debug`, as that creates /dev/sda -- but then trying to
create partitions on it doesn't have any namespace room for /dev/sda1
etc., as that is already taken. This breaks all storage tests which use
a RAM disk.

That package isn't yet installed in Fedora 39/40, only rawhide. We don't
need it and it only causes trouble → kann weg.

Fixes cockpit-project#20520
  • Loading branch information
martinpitt committed May 29, 2024
1 parent 89a30ba commit dabe3be
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions test/browser/browser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ if rpm -q setroubleshoot-server; then
dnf remove -y --setopt=clean_requirements_on_remove=False setroubleshoot-server
fi

# HACK: this package creates bogus/broken sda → nvme symlinks; it's new in rawhide TF default instances, not required for
# our tests, and only causes trouble; https://github.com/amazonlinux/amazon-ec2-utils/issues/37
if rpm -q amazon-ec2-utils; then
rpm -e --verbose amazon-ec2-utils
# clean up the symlinks
udevadm trigger /dev/nvme*
fi

if grep -q 'ID=.*fedora' /etc/os-release && [ "$PLAN" = "main" ]; then
# Fedora-only packages which are not available in CentOS/RHEL
# required by TestLogin.testBasic
Expand Down

0 comments on commit dabe3be

Please # to comment.