From dabe3bed5455130f902e07219077cb89377f966a Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 29 May 2024 06:53:30 +0200 Subject: [PATCH] =?UTF-8?q?fmf:=20Fix=20bogus=20/dev/sda*=20=E2=86=92=20nv?= =?UTF-8?q?me*=20symlinks=20on=20TF=20machines?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rawhide Testing Farm machines started to get a set of symlinks like /dev/sda1 -> nvme0n1 (but *no* /dev/sda), via amazon-ec2-utils (https://github.com/amazonlinux/amazon-ec2-utils/issues/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 #20520 --- test/browser/browser.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/browser/browser.sh b/test/browser/browser.sh index f81ac9d188f3..bda9f3a839c5 100755 --- a/test/browser/browser.sh +++ b/test/browser/browser.sh @@ -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