Unverified Commit cfb8505a authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #274087 from numinit/revert-nebula-wait-for-service 

nixos/nebula: tests: revert wait_for_unit
parents 18a19d8d 49ebc387

nixos/tests/nebula.nix

+0 −5
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ in 


    restartAndCheckNebula = name: ip: ''

      ${name}.systemctl("restart nebula@smoke.service")

      ${name}.wait_for_unit("nebula@smoke.service")

      ${name}.succeed("ping -c5 ${ip}")

    '';
@@ -180,8 +179,6 @@ in 
      ${nodeB}.succeed("iptables -I INPUT -s " + node_a + " -j DROP")

      ${nodeA}.systemctl("restart nebula@smoke.service")

      ${nodeB}.systemctl("restart nebula@smoke.service")

      ${nodeA}.wait_for_unit("nebula@smoke.service")

      ${nodeB}.wait_for_unit("nebula@smoke.service")

    '';

    allowTrafficBetween = nodeA: nodeB: ''

      node_a = ${getPublicIp nodeA}
@@ -190,8 +187,6 @@ in 
      ${nodeB}.succeed("iptables -D INPUT -s " + node_a + " -j DROP")

      ${nodeA}.systemctl("restart nebula@smoke.service")

      ${nodeB}.systemctl("restart nebula@smoke.service")

      ${nodeA}.wait_for_unit("nebula@smoke.service")

      ${nodeB}.wait_for_unit("nebula@smoke.service")

    '';

  in ''

    # Create the certificate and sign the lighthouse's keys.