summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-09-28 14:25:05 +0200
committerDomen Kožar <domen@dev.si>2014-09-28 14:25:11 +0200
commit63280c511effbe1c7d6892304242aa094dc56bae (patch)
tree632a1e4ab5ebcd31ae587be7915e4279c9171d73
parent97be74be1649ab7376428564a15087ad3ffce3cf (diff)
downloadnixpkgs-63280c511effbe1c7d6892304242aa094dc56bae.tar
nixpkgs-63280c511effbe1c7d6892304242aa094dc56bae.tar.gz
nixpkgs-63280c511effbe1c7d6892304242aa094dc56bae.tar.bz2
nixpkgs-63280c511effbe1c7d6892304242aa094dc56bae.tar.lz
nixpkgs-63280c511effbe1c7d6892304242aa094dc56bae.tar.xz
nixpkgs-63280c511effbe1c7d6892304242aa094dc56bae.tar.zst
nixpkgs-63280c511effbe1c7d6892304242aa094dc56bae.zip
nixos: munin/jenkins: specify timeout correctly
-rw-r--r--nixos/tests/jenkins.nix2
-rw-r--r--nixos/tests/munin.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 5fdd0576276..3f4a197ebcc 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -17,7 +17,7 @@ import ./make-test.nix {
 
         users.extraUsers.jenkins.extraGroups = [ "users" ];
 
-        systemd.services.jenkins.unitConfig.TimeoutSec = 600;
+        systemd.services.jenkins.serviceConfig.TimeoutStartSec = "3min";
       };
 
     slave =
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 5f9378c0fa5..1e51453df83 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -18,7 +18,7 @@ import ./make-test.nix {
              '';
            };
           };
-          systemd.services.munin-node.unitConfig.TimeoutSec = 600;
+          systemd.services.munin-node.serviceConfig.TimeoutStartSec = "3min";
         };
     };