From be394fcaffbf103125c116dca8d296243a7e29d9 Mon Sep 17 00:00:00 2001 From: Nick Rosbrook Date: Fri, 14 Nov 2025 13:21:02 -0500 Subject: [PATCH 1/2] test: increase timeout waiting for zone DS records setup This test is flaky on the infrastructure due to this setup step timing out. As a naive step, just increase the timeout to 60s. Part 1 of #39602 --- test/units/TEST-75-RESOLVED.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/units/TEST-75-RESOLVED.sh b/test/units/TEST-75-RESOLVED.sh index f8e6ffa56d..0fa7e6ac72 100755 --- a/test/units/TEST-75-RESOLVED.sh +++ b/test/units/TEST-75-RESOLVED.sh @@ -185,7 +185,7 @@ EOF fi systemctl start knot # Wait for signed.test's zone DS records to get pushed to the parent zone - timeout 30s bash -xec 'until knotc zone-read test. signed.test. ds | grep -E "signed\.test\. [0-9]+ DS"; do sleep 2; done' + timeout 60s bash -xec 'until knotc zone-read test. signed.test. ds | grep -E "signed\.test\. [0-9]+ DS"; do sleep 2; done' systemctl status resolved-dummy-server networkctl status From 40a6069f9a390254abbf69acebe9ef7f24d2af3e Mon Sep 17 00:00:00 2001 From: Nick Rosbrook Date: Fri, 14 Nov 2025 14:13:07 -0500 Subject: [PATCH 2/2] test: adjust timeouts for testcase_15_wait_online_dns Do not set a timeout on the wait-online call, since there are timeout calls later that will prevent the test from blocking forever. Increase those timeout calls for slower CI runs. --- test/units/TEST-75-RESOLVED.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/units/TEST-75-RESOLVED.sh b/test/units/TEST-75-RESOLVED.sh index 0fa7e6ac72..232180ccf3 100755 --- a/test/units/TEST-75-RESOLVED.sh +++ b/test/units/TEST-75-RESOLVED.sh @@ -1451,10 +1451,10 @@ testcase_15_wait_online_dns() { # Begin systemd-networkd-wait-online --dns systemd-run -u "$unit" -p "Environment=SYSTEMD_LOG_LEVEL=debug" -p "Environment=SYSTEMD_LOG_TARGET=journal" --service-type=exec \ - /usr/lib/systemd/systemd-networkd-wait-online --timeout=20 --dns --interface=dns0 + /usr/lib/systemd/systemd-networkd-wait-online --timeout=0 --dns --interface=dns0 # Wait until it blocks waiting for updated DNS config - timeout 10 bash -c "journalctl -b -u $unit -f | grep -q -m1 'dns0: No.*DNS server is accessible'" + timeout 30 bash -c "journalctl -b -u $unit -f | grep -q -m1 'dns0: No.*DNS server is accessible'" # Update the global configuration. Restart rather than reload systemd-resolved so that # systemd-networkd-wait-online has to re-connect to the varlink service. @@ -1465,7 +1465,7 @@ testcase_15_wait_online_dns() { systemctl restart systemd-resolved.service # Wait for the monitor to exit gracefully. - timeout 10 bash -c "while systemctl --quiet is-active $unit; do sleep 0.5; done" + timeout 30 bash -c "while systemctl --quiet is-active $unit; do sleep 0.5; done" journalctl --sync # Check that a disconnect happened, and was handled.