kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: fixed KVERSION and qemu backwards compatiblity

master
Harald Hoyer 2018-08-14 13:58:21 +02:00
parent 94cc856cb8
commit ca8f1c1ba3
2 changed files with 115 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
test/TEST-50-MULTINIC/test.sh
View File

@ -12,19 +12,36 @@ run_server() {
echo "MULTINIC TEST SETUP: Starting DHCP/NFS server" echo "MULTINIC TEST SETUP: Starting DHCP/NFS server"


fsck -a "$TESTDIR"/server.ext3 || return 1 fsck -a "$TESTDIR"/server.ext3 || return 1
$testdir/run-qemu \
-drive format=raw,index=0,media=disk,file="$TESTDIR"/server.ext3 \ if $testdir/run-qemu --help | grep -qF -m1 'netdev hubport,id=str,hubid=n[,netdev=nd]' && echo OK; then
-m 512M -smp 2 \ $testdir/run-qemu \
-display none \ -drive format=raw,index=0,media=disk,file="$TESTDIR"/server.ext3 \
-net socket,listen=127.0.0.1:12350 \ -m 512M -smp 2 \
-net nic,macaddr=52:54:01:12:34:56,model=e1000 \ -display none \
${SERIAL:+-serial "$SERIAL"} \ -net socket,listen=127.0.0.1:12350 \
${SERIAL:--serial file:"$TESTDIR"/server.log} \ -net nic,macaddr=52:54:01:12:34:56,model=e1000 \
-watchdog i6300esb -watchdog-action poweroff \ ${SERIAL:+-serial "$SERIAL"} \
-no-reboot \ ${SERIAL:--serial file:"$TESTDIR"/server.log} \
-append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ -watchdog i6300esb -watchdog-action poweroff \
-initrd "$TESTDIR"/initramfs.server \ -no-reboot \
-pidfile "$TESTDIR"/server.pid -daemonize || return 1 -append "panic=1 loglevel=7 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
-initrd "$TESTDIR"/initramfs.server \
-pidfile "$TESTDIR"/server.pid -daemonize || return 1
else
$testdir/run-qemu \
-drive format=raw,index=0,media=disk,file="$TESTDIR"/client.img -m 512M -smp 2 -nographic \
-net socket,vlan=0,connect=127.0.0.1:12350 \
-net nic,vlan=0,macaddr=52:54:00:12:34:$mac1,model=e1000 \
-net nic,vlan=0,macaddr=52:54:00:12:34:$mac2,model=e1000 \
-net nic,vlan=0,macaddr=52:54:00:12:34:$mac3,model=e1000 \
-net nic,vlan=1,macaddr=52:54:00:12:34:98,model=e1000 \
-net nic,vlan=2,macaddr=52:54:00:12:34:99,model=e1000 \
-watchdog i6300esb -watchdog-action poweroff \
-no-reboot \
-append "panic=1 rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console loglevel=7" \
-initrd "$TESTDIR"/initramfs.testing
fi

sudo chmod 644 -- "$TESTDIR"/server.pid || return 1 sudo chmod 644 -- "$TESTDIR"/server.pid || return 1


# Cleanup the terminal if we have one # Cleanup the terminal if we have one
@ -51,18 +68,18 @@ client_test() {
fi fi


$testdir/run-qemu -drive format=raw,index=0,media=disk,file="$TESTDIR"/client.img -m 512M -smp 2 -nographic \ $testdir/run-qemu -drive format=raw,index=0,media=disk,file="$TESTDIR"/client.img -m 512M -smp 2 -nographic \
-net socket,connect=127.0.0.1:12350 \ -net socket,connect=127.0.0.1:12350 \
-net nic,macaddr=52:54:00:12:34:$mac1,model=e1000 \ -net nic,macaddr=52:54:00:12:34:$mac1,model=e1000 \
-net nic,macaddr=52:54:00:12:34:$mac2,model=e1000 \ -net nic,macaddr=52:54:00:12:34:$mac2,model=e1000 \
-net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \ -net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \
-netdev hubport,id=n1,hubid=1 \ -netdev hubport,id=n1,hubid=1 \
-netdev hubport,id=n2,hubid=2 \ -netdev hubport,id=n2,hubid=2 \
-device e1000,netdev=n1,mac=52:54:00:12:34:98 \ -device e1000,netdev=n1,mac=52:54:00:12:34:98 \
-device e1000,netdev=n2,mac=52:54:00:12:34:99 \ -device e1000,netdev=n2,mac=52:54:00:12:34:99 \
-watchdog i6300esb -watchdog-action poweroff \ -watchdog i6300esb -watchdog-action poweroff \
-no-reboot \ -no-reboot \
-append "panic=1 rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console loglevel=7" \ -append "panic=1 rd.shell=0 $cmdline $DEBUGFAIL rd.retry=5 ro console=ttyS0,115200n81 selinux=0 init=/sbin/init rd.debug systemd.log_target=console loglevel=7" \
-initrd "$TESTDIR"/initramfs.testing -initrd "$TESTDIR"/initramfs.testing


{ read OK; read IFACES; } < "$TESTDIR"/client.img { read OK; read IFACES; } < "$TESTDIR"/client.img


@ -110,58 +127,58 @@ test_client() {


# PXE Style BOOTIF= # PXE Style BOOTIF=
client_test "MULTINIC root=nfs BOOTIF=" \ client_test "MULTINIC root=nfs BOOTIF=" \
00 01 02 \ 00 01 02 \
"root=nfs:192.168.50.1:/nfs/client BOOTIF=52-54-00-12-34-00" \ "root=nfs:192.168.50.1:/nfs/client BOOTIF=52-54-00-12-34-00" \
"ens3" || return 1 "ens3" || return 1


client_test "MULTINIC root=nfs BOOTIF= ip=ens4:dhcp" \ client_test "MULTINIC root=nfs BOOTIF= ip=ens4:dhcp" \
00 01 02 \ 00 01 02 \
"root=nfs:192.168.50.1:/nfs/client BOOTIF=52-54-00-12-34-00 ip=ens4:dhcp" \ "root=nfs:192.168.50.1:/nfs/client BOOTIF=52-54-00-12-34-00 ip=ens4:dhcp" \
"ens3 ens4" || return 1 "ens3 ens4" || return 1


# PXE Style BOOTIF= with dhcp root-path # PXE Style BOOTIF= with dhcp root-path
client_test "MULTINIC root=dhcp BOOTIF=" \ client_test "MULTINIC root=dhcp BOOTIF=" \
00 01 02 \ 00 01 02 \
"root=dhcp BOOTIF=52-54-00-12-34-02" \ "root=dhcp BOOTIF=52-54-00-12-34-02" \
"ens5" || return 1 "ens5" || return 1


# Multinic case, where only one nic works # Multinic case, where only one nic works
client_test "MULTINIC root=nfs ip=dhcp" \ client_test "MULTINIC root=nfs ip=dhcp" \
FF 00 FE \ FF 00 FE \
"root=nfs:192.168.50.1:/nfs/client ip=dhcp" \ "root=nfs:192.168.50.1:/nfs/client ip=dhcp" \
"ens4" || return 1 "ens4" || return 1


# Require two interfaces # Require two interfaces
client_test "MULTINIC root=nfs ip=ens4:dhcp ip=ens5:dhcp bootdev=ens4" \ client_test "MULTINIC root=nfs ip=ens4:dhcp ip=ens5:dhcp bootdev=ens4" \
00 01 02 \ 00 01 02 \
"root=nfs:192.168.50.1:/nfs/client ip=ens4:dhcp ip=ens5:dhcp bootdev=ens4" \ "root=nfs:192.168.50.1:/nfs/client ip=ens4:dhcp ip=ens5:dhcp bootdev=ens4" \
"ens4 ens5" || return 1 "ens4 ens5" || return 1


# Require three interfaces with dhcp root-path # Require three interfaces with dhcp root-path
client_test "MULTINIC root=dhcp ip=ens3:dhcp ip=ens4:dhcp ip=ens5:dhcp bootdev=ens5" \ client_test "MULTINIC root=dhcp ip=ens3:dhcp ip=ens4:dhcp ip=ens5:dhcp bootdev=ens5" \
00 01 02 \ 00 01 02 \
"root=dhcp ip=ens3:dhcp ip=ens4:dhcp ip=ens5:dhcp bootdev=ens5" \ "root=dhcp ip=ens3:dhcp ip=ens4:dhcp ip=ens5:dhcp bootdev=ens5" \
"ens3 ens4 ens5" || return 1 "ens3 ens4 ens5" || return 1


client_test "MULTINIC bonding" \ client_test "MULTINIC bonding" \
00 01 02 \ 00 01 02 \
"root=nfs:192.168.50.1:/nfs/client ip=bond0:dhcp bond=bond0:ens3,ens4,ens5:mode=balance-rr" \ "root=nfs:192.168.50.1:/nfs/client ip=bond0:dhcp bond=bond0:ens3,ens4,ens5:mode=balance-rr" \
"bond0" || return 1 "bond0" || return 1


client_test "MULTINIC bridging" \ client_test "MULTINIC bridging" \
00 01 02 \ 00 01 02 \
"root=nfs:192.168.50.1:/nfs/client ip=bridge0:dhcp bridge=bridge0:ens3,ens6,ens7" \ "root=nfs:192.168.50.1:/nfs/client ip=bridge0:dhcp bridge=bridge0:ens3,ens6,ens7" \
"bridge0" || return 1 "bridge0" || return 1
return 0 return 0
} }


test_setup() { test_setup() {
# Make server root # Make server root
dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=120 dd if=/dev/null of="$TESTDIR"/server.ext3 bs=1M seek=120
mke2fs -j -F -- "$TESTDIR"/server.ext3 mke2fs -j -F -- "$TESTDIR"/server.ext3
mkdir -- "$TESTDIR"/mnt mkdir -- "$TESTDIR"/mnt
sudo mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt sudo mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt

kernel=$KVERSION
( (
export initdir="$TESTDIR"/mnt export initdir="$TESTDIR"/mnt
. "$basedir"/dracut-init.sh . "$basedir"/dracut-init.sh
@ -185,9 +202,9 @@ test_setup() {
done done


inst_multiple sh ls shutdown poweroff stty cat ps ln ip \ inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
dmesg mkdir cp ping exportfs \ dmesg mkdir cp ping exportfs \
modprobe rpc.nfsd rpc.mountd showmount tcpdump \ modprobe rpc.nfsd rpc.mountd showmount tcpdump \
/etc/services sleep mount chmod /etc/services sleep mount chmod
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
[ -f "${_terminfodir}"/l/linux ] && break [ -f "${_terminfodir}"/l/linux ] && break
done done
@ -212,7 +229,7 @@ test_setup() {
inst_libdir_file 'libnfsidmap*.so*' inst_libdir_file 'libnfsidmap*.so*'


_nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' /etc/nsswitch.conf \ _nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' /etc/nsswitch.conf \
| tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|') | tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|')
_nsslibs=${_nsslibs#|} _nsslibs=${_nsslibs#|}
_nsslibs=${_nsslibs%|} _nsslibs=${_nsslibs%|}


@ -241,7 +258,7 @@ test_setup() {
done done
) )
inst_multiple sh shutdown poweroff stty cat ps ln ip \ inst_multiple sh shutdown poweroff stty cat ps ln ip \
mount dmesg mkdir cp ping grep ls mount dmesg mkdir cp ping grep ls
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
[[ -f ${_terminfodir}/l/linux ]] && break [[ -f ${_terminfodir}/l/linux ]] && break
done done
@ -258,7 +275,7 @@ test_setup() {
inst_libdir_file 'libnfsidmap*.so*' inst_libdir_file 'libnfsidmap*.so*'


_nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' -- /etc/nsswitch.conf \ _nsslibs=$(sed -e '/^#/d' -e 's/^.*://' -e 's/\[NOTFOUND=return\]//' -- /etc/nsswitch.conf \
| tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|') | tr -s '[:space:]' '\n' | sort -u | tr -s '[:space:]' '|')
_nsslibs=${_nsslibs#|} _nsslibs=${_nsslibs#|}
_nsslibs=${_nsslibs%|} _nsslibs=${_nsslibs%|}


@ -282,14 +299,16 @@ test_setup() {
) )


# Make server's dracut image # Make server's dracut image
$basedir/dracut.sh -l -i "$TESTDIR"/overlay / \ $basedir/dracut.sh \
-l -i "$TESTDIR"/overlay / \
-m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \ -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
-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" \ -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 \ --no-hostonly-cmdline -N \
-f "$TESTDIR"/initramfs.server "$KVERSION" || return 1 -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1


# Make client's dracut image # Make client's dracut image
$basedir/dracut.sh -l -i "$TESTDIR"/overlay / \ $basedir/dracut.sh \
-l -i "$TESTDIR"/overlay / \
-o "plymouth" \ -o "plymouth" \
-a "debug" \ -a "debug" \
-d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \ -d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \

52
test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
View File

@ -14,6 +14,7 @@ run_server() {
echo "MULTINIC TEST SETUP: Starting DHCP/NFS server" echo "MULTINIC TEST SETUP: Starting DHCP/NFS server"


fsck -a "$TESTDIR"/server.ext3 || return 1 fsck -a "$TESTDIR"/server.ext3 || return 1

$testdir/run-qemu \ $testdir/run-qemu \
-hda "$TESTDIR"/server.ext3 \ -hda "$TESTDIR"/server.ext3 \
-m 512M -smp 2 \ -m 512M -smp 2 \
@ -66,17 +67,38 @@ client_test() {
nic3=" -netdev hubport,id=n3,hubid=3" nic3=" -netdev hubport,id=n3,hubid=3"
fi fi


$testdir/run-qemu -hda "$TESTDIR"/client.img -m 512M -smp 2 -nographic \ if $testdir/run-qemu --help | grep -qF -m1 'netdev hubport,id=str,hubid=n[,netdev=nd]' && echo OK; then
-netdev socket,connect=127.0.0.1:12370,id=s1 -netdev hubport,hubid=1,id=h1,netdev=s1 \ $testdir/run-qemu \
-netdev hubport,hubid=1,id=h2 -device e1000,mac=52:54:00:12:34:01,netdev=h2 \ -hda "$TESTDIR"/client.img -m 512M -smp 2 -nographic \
-netdev hubport,hubid=1,id=h3 -device e1000,mac=52:54:00:12:34:02,netdev=h3 \ -netdev socket,connect=127.0.0.1:12370,id=s1 \
$nic1 -device e1000,mac=52:54:00:12:34:03,netdev=n1 \ -netdev hubport,hubid=1,id=h1,netdev=s1 \
-netdev socket,connect=127.0.0.1:12372,id=n2 -device e1000,mac=52:54:00:12:34:04,netdev=n2 \ -netdev hubport,hubid=1,id=h2 -device e1000,mac=52:54:00:12:34:01,netdev=h2 \
$nic3 -device e1000,mac=52:54:00:12:34:05,netdev=n3 \ -netdev hubport,hubid=1,id=h3 -device e1000,mac=52:54:00:12:34:02,netdev=h3 \
-watchdog i6300esb -watchdog-action poweroff \ $nic1 -device e1000,mac=52:54:00:12:34:03,netdev=n1 \
-no-reboot \ -netdev socket,connect=127.0.0.1:12372,id=n2 -device e1000,mac=52:54:00:12:34:04,netdev=n2 \
-append "panic=1 $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \ $nic3 -device e1000,mac=52:54:00:12:34:05,netdev=n3 \
-initrd "$TESTDIR"/initramfs.testing -watchdog i6300esb -watchdog-action poweroff \
-no-reboot \
-append "panic=1 $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-initrd "$TESTDIR"/initramfs.testing
else
$testdir/run-qemu \
-hda "$TESTDIR"/client.img -m 512M -smp 2 -nographic \
-net socket,vlan=0,connect=127.0.0.1:12370 \
${do_vlan13:+-net socket,vlan=1,connect=127.0.0.1:12371} \
-net socket,vlan=2,connect=127.0.0.1:12372 \
${do_vlan13:+-net socket,vlan=3,connect=127.0.0.1:12373} \
-net nic,vlan=0,macaddr=52:54:00:12:34:01,model=e1000 \
-net nic,vlan=0,macaddr=52:54:00:12:34:02,model=e1000 \
-net nic,vlan=1,macaddr=52:54:00:12:34:03,model=e1000 \
-net nic,vlan=2,macaddr=52:54:00:12:34:04,model=e1000 \
-net nic,vlan=3,macaddr=52:54:00:12:34:05,model=e1000 \
-watchdog i6300esb -watchdog-action poweroff \
-no-reboot \
-append "panic=1 $cmdline rd.debug $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
-initrd "$TESTDIR"/initramfs.testing
fi

{ {
read OK read OK
if [[ "$OK" != "OK" ]]; then if [[ "$OK" != "OK" ]]; then
@ -167,7 +189,7 @@ test_setup() {
mke2fs -j -F -- "$TESTDIR"/server.ext3 mke2fs -j -F -- "$TESTDIR"/server.ext3
mkdir -- "$TESTDIR"/mnt mkdir -- "$TESTDIR"/mnt
mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt mount -o loop -- "$TESTDIR"/server.ext3 "$TESTDIR"/mnt

kernel=$KVERSION
( (
export initdir="$TESTDIR"/mnt export initdir="$TESTDIR"/mnt
. "$basedir"/dracut-init.sh . "$basedir"/dracut-init.sh
@ -203,7 +225,7 @@ test_setup() {
[ -f /etc/netconfig ] && inst_multiple /etc/netconfig [ -f /etc/netconfig ] && inst_multiple /etc/netconfig
type -P dhcpd >/dev/null && inst_multiple dhcpd type -P dhcpd >/dev/null && inst_multiple dhcpd
[ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd
instmods nfsd sunrpc ipv6 lockd af_packet 8021q instmods nfsd sunrpc ipv6 lockd af_packet 8021q ipvlan macvlan
inst_simple /etc/os-release inst_simple /etc/os-release
inst ./server-init.sh /sbin/init inst ./server-init.sh /sbin/init
inst ./hosts /etc/hosts inst ./hosts /etc/hosts
@ -286,7 +308,7 @@ test_setup() {
$basedir/dracut.sh -l -i "$TESTDIR"/overlay / \ $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
--no-early-microcode \ --no-early-microcode \
-m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \ -m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
-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" \ -d "ipvlan macvlan 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 \ --no-hostonly-cmdline -N \
-f "$TESTDIR"/initramfs.server "$KVERSION" || return 1 -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1


@ -295,7 +317,7 @@ test_setup() {
--no-early-microcode \ --no-early-microcode \
-o "plymouth" \ -o "plymouth" \
-a "debug" \ -a "debug" \
-d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \ -d "ipvlan macvlan af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files sunrpc i6300esb ib700wdt" \
--no-hostonly-cmdline -N \ --no-hostonly-cmdline -N \
-f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
} }