From d93cc53f5cb13470298b6cbb40fad3db0a64670a Mon Sep 17 00:00:00 2001
From: jbtrystram <jbtrystram@redhat.com>
Date: Fri, 5 Apr 2024 15:14:40 +0200
Subject: [PATCH] ext-tests/ext Fix var-mount/scsi-id failure on rawhide

Update the scsci-id test to set a WWN for the disk, and use reliable
udev symlinks to adjust for a change in sg3_utils [1]

Note that the `wwn` value set is converted to base 16 by QEMU,
so the symlink in the ignition config must reflects it.

This requires https://github.com/coreos/coreos-assembler/pull/3772
See https://github.com/coreos/fedora-coreos-tracker/issues/1670

[1] https://listman.redhat.com/archives/dm-devel/2023-March/053645.html
---
 tests/kola/var-mount/scsi-id/config.bu | 3 ++-
 tests/kola/var-mount/scsi-id/test.sh   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/kola/var-mount/scsi-id/config.bu b/tests/kola/var-mount/scsi-id/config.bu
index 97677034a1..276f4f405f 100644
--- a/tests/kola/var-mount/scsi-id/config.bu
+++ b/tests/kola/var-mount/scsi-id/config.bu
@@ -2,7 +2,8 @@ variant: fcos
 version: 1.4.0
 storage:
   disks:
-    - device: /dev/disk/by-id/scsi-0NVME_VirtualMultipath_disk1
+    # the symlink is from wwn=123456789 converted to hexadecimal (base16)
+    - device: /dev/disk/by-id/scsi-300000000075bcd15
       wipe_table: true
       partitions:
         - number: 1
diff --git a/tests/kola/var-mount/scsi-id/test.sh b/tests/kola/var-mount/scsi-id/test.sh
index 4885786856..405f7a0f55 100755
--- a/tests/kola/var-mount/scsi-id/test.sh
+++ b/tests/kola/var-mount/scsi-id/test.sh
@@ -2,7 +2,7 @@
 ## kola:
 ##   # additionalDisks is only supported on QEMU
 ##   platforms: qemu
-##   additionalDisks: ["5G:mpath"]
+##   additionalDisks: ["5G:channel=scsi,wwn=123456789"]
 ##   description: Verify udev rules /dev/disk/by-id/scsi-* symlinks exist
 ##     in initramfs.