File TEST-35-ISCSI-MULTI-V59-openQA.patch of Package dracut

Overview Repositories Revisions Requests Users Attributes Meta

File TEST-35-ISCSI-MULTI-V59-openQA.patch of Package dracut (Revision 72733f65d23e67ab6034c5fc18313e4b)

Currently displaying revision 72733f65d23e67ab6034c5fc18313e4b , Show latest

From a7d50a53de89d61507bd716565cc78380830d6d9 Mon Sep 17 00:00:00 2001
From: nkrapp <nico.krapp@suse.com>
Date: Mon, 8 May 2023 11:59:10 +0200
Subject: [PATCH] Patch TEST-35

---
 test/TEST-35-ISCSI-MULTI/server-init.sh    | 24 +++++++++++----
 test/TEST-35-ISCSI-MULTI/test.sh           | 36 ++++++++++++++--------
 test/TEST-35-ISCSI-MULTI/wait-if-server.sh |  4 +--
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/test/TEST-35-ISCSI-MULTI/server-init.sh b/test/TEST-35-ISCSI-MULTI/server-init.sh
index fd5538d86..0abda9fc4 100755
--- a/test/TEST-35-ISCSI-MULTI/server-init.sh
+++ b/test/TEST-35-ISCSI-MULTI/server-init.sh
@@ -47,20 +47,23 @@ linkup() {
     wait_for_if_link "$1" 2> /dev/null && ip link set "$1" up 2> /dev/null && wait_for_if_up "$1" 2> /dev/null
 }
 
-wait_for_if_link enx525400123456
-wait_for_if_link enx525400123457
+wait_for_if_link eth0
+wait_for_if_link eth1
 
 ip addr add 127.0.0.1/8 dev lo
 ip link set lo up
 
-ip addr add 192.168.50.1/24 dev enx525400123456
-linkup enx525400123456
+ip addr add 192.168.50.1/24 dev eth0
+linkup eth0
 
-ip addr add 192.168.51.1/24 dev enx525400123457
-linkup enx525400123457
+ip addr add 192.168.51.1/24 dev eth1
+linkup eth1
 
 modprobe af_packet
 
+wait_for_route_ok
+
+ip link set eth1 promisc on
 : > /var/lib/dhcpd/dhcpd.leases
 chmod 777 /var/lib/dhcpd/dhcpd.leases
 dhcpd -d -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases &
@@ -76,6 +79,15 @@ tgtadm --lld iscsi --mode target --op bind --tid 1 -I 192.168.50.101
 tgtadm --lld iscsi --mode target --op bind --tid 2 -I 192.168.51.101
 tgtadm --lld iscsi --mode target --op bind --tid 3 -I 192.168.50.101
 
+sleep 10
+
+echo targets:
+tgtadm --lld iscsi --mode target --op show
+echo portals:
+tgtadm --lld iscsi mode portal --op show
+
+tcpdump -i eth0 &
+
 # Wait forever for the VM to die
 echo "Serving iSCSI"
 while pidof tgtd > /dev/null; do
diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
index 20247d981..8790f0b4b 100755
--- a/test/TEST-35-ISCSI-MULTI/test.sh
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
@@ -7,6 +7,8 @@ TEST_DESCRIPTION="root filesystem over multiple iSCSI with $USE_NETWORK"
 
 KVERSION=${KVERSION-$(uname -r)}
 
+export basedir=/usr/lib/dracut
+
 #DEBUGFAIL="rd.shell rd.break rd.debug loglevel=7 "
 #SERVER_DEBUG="rd.debug loglevel=7"
 #SERIAL="tcp:127.0.0.1:9999"
@@ -28,7 +30,7 @@ run_server() {
         -net nic,macaddr=52:54:00:12:34:56,model=e1000 \
         -net nic,macaddr=52:54:00:12:34:57,model=e1000 \
         -net socket,listen=127.0.0.1:12331 \
-        -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/disk/by-id/ata-disk_serverroot rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
+        -append "nompath panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/disk/by-id/ata-disk_serverroot rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0 $SERVER_DEBUG" \
         -initrd "$TESTDIR"/initramfs.server \
         -pidfile "$TESTDIR"/server.pid -daemonize || return 1
     chmod 644 "$TESTDIR"/server.pid || return 1
@@ -67,6 +69,7 @@ run_client() {
         -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 rd.shell=0 $DEBUGFAIL $*" \
         -initrd "$TESTDIR"/initramfs.testing
     if ! grep -U --binary-files=binary -F -m 1 -q iscsi-OK "$TESTDIR"/marker.img; then
+        cp "$TESTDIR"/server.log /tmp/dracut-testsuite-logs/
         echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
         return 1
     fi
@@ -79,8 +82,8 @@ do_test_run() {
     initiator=$(iscsi-iname)
     run_client "netroot=iscsi target1 target2" \
         "root=LABEL=sysroot" \
-        "ip=192.168.50.101:::255.255.255.0::enp0s1:off" \
-        "ip=192.168.51.101:::255.255.255.0::enp0s2:off" \
+        "ip=192.168.50.101:::255.255.255.0::eth0:off" \
+        "ip=192.168.51.101:::255.255.255.0::eth1:off" \
         "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \
         "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
         "rd.iscsi.initiator=$initiator" \
@@ -88,8 +91,8 @@ do_test_run() {
 
     run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0" \
         "root=LABEL=sysroot" \
-        "ip=192.168.50.101:::255.255.255.0::enp0s1:off" \
-        "ip=192.168.51.101:::255.255.255.0::enp0s2:off" \
+        "ip=192.168.50.101:::255.255.255.0::eth0:off" \
+        "ip=192.168.51.101:::255.255.255.0::eth1:off" \
         "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \
         "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
         "rd.iscsi.firmware" \
@@ -99,8 +102,8 @@ do_test_run() {
 
     run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
         "root=LABEL=sysroot" \
-        "ip=192.168.50.101:::255.255.255.0::enp0s1:off" \
-        "ip=192.168.51.101:::255.255.255.0::enp0s2:off" \
+        "ip=192.168.50.101:::255.255.255.0::eth0:off" \
+        "ip=192.168.51.101:::255.255.255.0::eth1:off" \
         "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \
         "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
         "rd.iscsi.firmware" \
@@ -110,8 +113,8 @@ do_test_run() {
 
     run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0 default GW" \
         "root=LABEL=sysroot" \
-        "ip=192.168.50.101::192.168.50.1:255.255.255.0::enp0s1:off" \
-        "ip=192.168.51.101::192.168.51.1:255.255.255.0::enp0s2:off" \
+        "ip=192.168.50.101::192.168.50.1:255.255.255.0::eth0:off" \
+        "ip=192.168.51.101::192.168.51.1:255.255.255.0::eth1:off" \
         "netroot=iscsi:192.168.51.1::::iqn.2009-06.dracut:target1" \
         "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
         "rd.iscsi.firmware" \
@@ -130,6 +133,14 @@ test_run() {
     fi
     do_test_run
     ret=$?
+
+    TESTNAME=$(basename $(pwd))
+    for file in $(ls $TESTDIR); do
+        #[[ $file = *.img ]] && continue
+        [[ $file = *.log ]] || continue
+        cp -v $TESTDIR/$file /root/dracut-testsuite-logs/$TESTNAME-$file
+    done
+
     if [[ -s $TESTDIR/server.pid ]]; then
         kill -TERM "$(cat "$TESTDIR"/server.pid)"
         rm -f -- "$TESTDIR"/server.pid
@@ -192,8 +203,9 @@ test_setup() {
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        -m "dash crypt lvm mdraid kernel-modules qemu" \
+        -m "bash crypt lvm mdraid kernel-modules qemu" \
         -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
+        -o "systemd-initrd systemd" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
     rm -rf -- "$TESTDIR"/overlay
@@ -295,7 +295,7 @@ test_setup() {
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        -m "dash rootfs-block kernel-modules qemu" \
+        -m "bash rootfs-block kernel-modules qemu" \
         -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --nomdadmconf \
         --no-hostonly-cmdline -N \
@@ -336,7 +348,7 @@ test_setup() {
     )
     # Make server's dracut image
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
-        -a "dash rootfs-block debug kernel-modules network network-legacy" \
+        -a "bash rootfs-block debug kernel-modules network network-legacy" \
         -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 drbg" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1
@@ -352,4 +364,4 @@ test_cleanup() {
 }
 
 # shellcheck disable=SC1090
-. "$testdir"/test-functions
+. "$basedir"/test/test-functions
diff --git a/test/TEST-35-ISCSI-MULTI/wait-if-server.sh b/test/TEST-35-ISCSI-MULTI/wait-if-server.sh
index b53e41fe6..2e26d9eda 100755
--- a/test/TEST-35-ISCSI-MULTI/wait-if-server.sh
+++ b/test/TEST-35-ISCSI-MULTI/wait-if-server.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 . /lib/net-lib.sh
-wait_for_if_link enx525400123456
-wait_for_if_link enx525400123457
+wait_for_if_link eth0
+wait_for_if_link eth1

Places

File TEST-35-ISCSI-MULTI-V59-openQA.patch of Package dracut (Revision 72733f65d23e67ab6034c5fc18313e4b)

Places