Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:tsaupe:branches:Base:System:dracut-openqa-v059
dracut
TEST-50-MULTINIC-adapt-for-openQA.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File TEST-50-MULTINIC-adapt-for-openQA.patch of Package dracut
From 58d212dc0add23455d58dcb7f9cdaa50bcea1a58 Mon Sep 17 00:00:00 2001 From: Robert Richardson <robert.richardson@suse.com> Date: Wed, 13 Apr 2022 12:13:09 +0200 Subject: [PATCH] test 50 patch --- test/TEST-50-MULTINIC/server-init.sh | 6 ++-- test/TEST-50-MULTINIC/test.sh | 40 +++++++++++++------------ test/TEST-50-MULTINIC/wait-if-server.sh | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/test/TEST-50-MULTINIC/server-init.sh b/test/TEST-50-MULTINIC/server-init.sh index 0808d8d7..5527d85b 100755 --- a/test/TEST-50-MULTINIC/server-init.sh +++ b/test/TEST-50-MULTINIC/server-init.sh @@ -48,12 +48,12 @@ 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 enx525401123456 +wait_for_if_link eth0 ip addr add 127.0.0.1/8 dev lo ip link set lo up -ip addr add 192.168.50.1/24 dev enx525401123456 -linkup enx525401123456 +ip addr add 192.168.50.1/24 dev eth0 +linkup eth0 : > /dev/watchdog modprobe af_packet diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 81b1f685..abd20868 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -13,6 +13,8 @@ TEST_DESCRIPTION="root filesystem on NFS with multiple nics with $USE_NETWORK" KVERSION=${KVERSION-$(uname -r)} +export basedir=/usr/lib/dracut + # Uncomment this to debug failures #DEBUGFAIL="loglevel=7 rd.shell rd.break" #SERIAL="tcp:127.0.0.1:9999" @@ -32,7 +34,7 @@ run_server() { -net nic,macaddr=52:54:01:12:34:56,model=e1000 \ -serial "${SERIAL:-"file:$TESTDIR/server.log"}" \ -watchdog i6300esb -watchdog-action poweroff \ - -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ + -append "nompath panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ -initrd "$TESTDIR"/initramfs.server \ -pidfile "$TESTDIR"/server.pid -daemonize || return 1 @@ -86,7 +88,7 @@ client_test() { -device e1000,netdev=n1,mac=52:54:00:12:34:98 \ -device e1000,netdev=n2,mac=52:54:00:12:34:99 \ -watchdog i6300esb -watchdog-action poweroff \ - -append "quiet panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console" \ + -append "nompath quiet panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console" \ -initrd "$TESTDIR"/initramfs.testing || return 1 { @@ -139,46 +141,46 @@ test_client() { client_test "MULTINIC root=nfs BOOTIF=" \ 00 01 02 \ "root=nfs:192.168.50.1:/nfs/client BOOTIF=52-54-00-12-34-00" \ - "enp0s1" || return 1 + "eth0" || return 1 - client_test "MULTINIC root=nfs BOOTIF= ip=enp0s3:dhcp" \ + client_test "MULTINIC root=nfs BOOTIF= ip=eth1:dhcp" \ 00 01 02 \ - "root=nfs:192.168.50.1:/nfs/client BOOTIF=52-54-00-12-34-00 ip=enp0s2:dhcp" \ - "enp0s1 enp0s2" || return 1 + "root=nfs:192.168.50.1:/nfs/client BOOTIF=52-54-00-12-34-00 ip=eth1:dhcp rd.neednet" \ + "eth0 eth1" || return 1 # PXE Style BOOTIF= with dhcp root-path client_test "MULTINIC root=dhcp BOOTIF=" \ 00 01 02 \ "root=dhcp BOOTIF=52-54-00-12-34-02" \ - "enp0s3" || return 1 + "eth2" || return 1 # Multinic case, where only one nic works client_test "MULTINIC root=nfs ip=dhcp" \ FF 00 FE \ "root=nfs:192.168.50.1:/nfs/client ip=dhcp" \ - "enp0s2" || return 1 + "eth1" || return 1 # Require two interfaces - client_test "MULTINIC root=nfs ip=enp0s2:dhcp ip=enp0s3:dhcp bootdev=enp0s2" \ + client_test "MULTINIC root=nfs ip=eth1:dhcp ip=eth2:dhcp bootdev=eth1" \ 00 01 02 \ - "root=nfs:192.168.50.1:/nfs/client ip=enp0s2:dhcp ip=enp0s3:dhcp bootdev=enp0s2" \ - "enp0s2 enp0s3" || return 1 + "root=nfs:192.168.50.1:/nfs/client ip=eth1:dhcp ip=eth2:dhcp bootdev=eth1" \ + "eth1 eth2" || return 1 # Require three interfaces with dhcp root-path - client_test "MULTINIC root=dhcp ip=enp0s1:dhcp ip=enp0s2:dhcp ip=enp0s3:dhcp bootdev=enp0s3" \ + client_test "MULTINIC root=dhcp ip=eth0:dhcp ip=eth1:dhcp ip=eth3:dhcp bootdev=eth2" \ 00 01 02 \ - "root=dhcp ip=enp0s1:dhcp ip=enp0s2:dhcp ip=enp0s3:dhcp bootdev=enp0s3" \ - "enp0s1 enp0s2 enp0s3" || return 1 + "root=dhcp ip=eth0:dhcp ip=eth1:dhcp ip=eth2:dhcp bootdev=eth2" \ + "eth0 eth1 eth2" || return 1 client_test "MULTINIC bonding" \ 00 01 02 \ - "root=nfs:192.168.50.1:/nfs/client ip=bond0:dhcp bond=bond0:enp0s1,enp0s2,enp0s3:mode=balance-rr" \ + "root=nfs:192.168.50.1:/nfs/client ip=bond0:dhcp bond=bond0:eth0,eth1,eth2:mode=balance-rr" \ "bond0" || return 1 # bridge, where only one interface is actually connected client_test "MULTINIC bridging" \ 00 01 02 \ - "root=nfs:192.168.50.1:/nfs/client ip=bridge0:dhcp bridge=bridge0:enp0s1,enp0s5,enp0s6" \ + "root=nfs:192.168.50.1:/nfs/client ip=bridge0:dhcp bridge=bridge0:eth0,eth4,eth5" \ "bridge0" || return 1 return 0 } @@ -354,7 +356,7 @@ test_setup() { ) # Make client's dracut image "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ - -o "ifcfg plymouth dash ${OMIT_NETWORK}" \ + -o "ifcfg plymouth bash ${OMIT_NETWORK}" \ -a "debug watchdog ${USE_NETWORK}" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 @@ -370,7 +372,7 @@ test_setup() { ) # Make server's dracut image "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ - -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog qemu network network-legacy" \ + -m "bash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog qemu network network-legacy" \ -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1 @@ -389,4 +391,4 @@ test_cleanup() { } # shellcheck disable=SC1090 -. "$testdir"/test-functions +. "$basedir"/test/test-functions diff --git a/test/TEST-50-MULTINIC/wait-if-server.sh b/test/TEST-50-MULTINIC/wait-if-server.sh index cea72593..bd96fe78 100644 --- a/test/TEST-50-MULTINIC/wait-if-server.sh +++ b/test/TEST-50-MULTINIC/wait-if-server.sh @@ -1,3 +1,3 @@ #!/bin/sh . /lib/net-lib.sh -wait_for_if_link enx525401123456 +wait_for_if_link eth0 -- 2.37.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor