From 462d9b9254d4386e9eac267547ee4e8cd2487c3d Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 1 Feb 2023 11:18:57 +0100 Subject: [PATCH] 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. --- test/TEST-20-NFS/test.sh | 2 +- test/TEST-50-MULTINIC/test.sh | 2 +- test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 8f26ddcc4..9a943bab6 100755 --- 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 9d84ff7d0..517278298 100755 --- 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 12afca94f..0a045f1f7 100755 --- 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 -- 2.47.2