diff --git a/nixos/tests/openvswitch.nix b/nixos/tests/openvswitch.nix index 679641717a1f..cd725ccb4071 100644 --- a/nixos/tests/openvswitch.nix +++ b/nixos/tests/openvswitch.nix @@ -56,7 +56,7 @@ node2.wait_for_unit("ovsdb.service") node2.wait_for_unit("ovs-vswitchd.service") - node1.succeed("ping -c3 10.0.0.2") - node2.succeed("ping -c3 10.0.0.1") + node1.wait_until_succeeds("ping -c1 10.0.0.2", timeout=30) + node2.wait_until_succeeds("ping -c1 10.0.0.1", timeout=30) ''; } diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix index 1795da60b495..14c273cc8cfe 100644 --- a/pkgs/by-name/op/openvswitch/package.nix +++ b/pkgs/by-name/op/openvswitch/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "openvswitch"; repo = "ovs"; tag = "v${version}"; - hash = "sha256-iiFpX4w6vdsRxjhRcxXTTtSAb8WPwg1afqwgBpzjhoA="; + hash = "sha256-x3n/Hv0hRx6d16qvIP40jFAOj6kli6u+5W95qGXvxuA="; }; outputs = [ @@ -132,7 +132,12 @@ stdenv.mkDerivation rec { incus = nixosTests.incus-lts.openvswitch; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v(3\\.5\\.[0-9]+)$" + ]; + }; }; meta = with lib; {