From f38d462b9b5771a8e429bb34d46275754f32398d Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 31 Jan 2025 18:54:59 -0800 Subject: [PATCH] nixosTests.networking.networkd.bond: fix flakiness We need to do the virtio link setup prior to `network.target`, since systemd-networkd orders itself before `network.target`. So in order for the bond to properly enslave the two virtio links, they should be configured as a part of `network-pre.target`. --- nixos/tests/networking/networkd-and-scripted.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index 3f89df818281..f2211738db2b 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -248,7 +248,7 @@ let ethtool -s enp1s0 speed 1000 duplex full ethtool -s enp2s0 speed 1000 duplex full ''; - wantedBy = [ "network.target" ]; + wantedBy = [ "network-pre.target" ]; }; }; in @@ -264,11 +264,11 @@ let client2.wait_for_unit("network.target") with subtest("Test bonding"): - client1.wait_until_succeeds("ping -c 2 192.168.1.1") - client1.wait_until_succeeds("ping -c 2 192.168.1.2") + client1.wait_until_succeeds("ping -c2 -w2 192.168.1.1") + client1.wait_until_succeeds("ping -c2 -w2 192.168.1.2") - client2.wait_until_succeeds("ping -c 2 192.168.1.1") - client2.wait_until_succeeds("ping -c 2 192.168.1.2") + client2.wait_until_succeeds("ping -c2 -w2 192.168.1.1") + client2.wait_until_succeeds("ping -c2 -w2 192.168.1.2") with subtest("Verify bonding mode"): for client in client1, client2: