fix(test): bump DHCP timeout to 30 seconds

The current interval (3 seconds) is very low and causes sporadic failures
especially when DHCP is run on a bridge (TEST-50-MULTINIC); in that specific
case, interfaces take time to be attached to the bridge and before enp0s1 is
attached all DISCOVER packets are lost.

Bump the timeout to a more robust value of 30 seconds.

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 8f26ddcc4ea63f551ec318a868396d90cebacfec..9a943bab6bda479a3834dcf2e5e653b98c6d665b 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -61,7 +61,7 @@ client_test() {
     # shellcheck disable=SC2034
     declare -i disk_index=0
     qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
-    cmdline="$cmdline rd.net.timeout.dhcp=3"
+    cmdline="$cmdline rd.net.timeout.dhcp=30"
 
     "$testdir"/run-qemu \
         "${disk_args[@]}" \

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index 9d84ff7d03b9daece4e38d9741e86c158efc5c68..5172782985fc3b5f762e13fa87f2c2135be48aca 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -63,7 +63,7 @@ client_test() {
     # shellcheck disable=SC2034
     declare -i disk_index=0
     qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
-    cmdline="$cmdline rd.net.timeout.dhcp=3"
+    cmdline="$cmdline rd.net.timeout.dhcp=30"
 
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     "$testdir"/run-qemu \

diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
index 12afca94f6afdbf12eb6c31e4e3f6eb16ee79e76..0a045f1f762927f2d265cbe857061aa00962e036 100755 (executable)
--- a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
+++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
@@ -92,7 +92,7 @@ client_test() {
         ifname=net3:52:54:00:12:34:03
         ifname=net4:52:54:00:12:34:04
         ifname=net5:52:54:00:12:34:05
-        $cmdline rd.net.timeout.dhcp=3 systemd.crash_reboot rd.debug
+        $cmdline rd.net.timeout.dhcp=30 systemd.crash_reboot rd.debug
         $DEBUGFAIL rd.retry=5 rw console=ttyS0,115200n81 selinux=0 init=/sbin/init" \
         -initrd "$TESTDIR"/initramfs.testing || return 1