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.
dracutdevs · Feb 7, 2023 · 462d9b9 · 462d9b9
1 parent da95948
commit 462d9b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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