diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-05 15:50:55 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-05 15:50:55 +0200 |
commit | 59edfd61ad839752dddb628813b6c74589649592 (patch) | |
tree | 60068ecccedd302af09982f4b1d4f4e85955605b /nixos | |
parent | da4fb089591e4f63c5f96255733c3034def95a36 (diff) | |
download | nixlib-59edfd61ad839752dddb628813b6c74589649592.tar nixlib-59edfd61ad839752dddb628813b6c74589649592.tar.gz nixlib-59edfd61ad839752dddb628813b6c74589649592.tar.bz2 nixlib-59edfd61ad839752dddb628813b6c74589649592.tar.lz nixlib-59edfd61ad839752dddb628813b6c74589649592.tar.xz nixlib-59edfd61ad839752dddb628813b6c74589649592.tar.zst nixlib-59edfd61ad839752dddb628813b6c74589649592.zip |
Increase systemd timeout on Jenkins and Munin tests
These were timing out a lot. http://hydra.nixos.org/build/13991108 http://hydra.nixos.org/build/13991107
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/monitoring/munin.nix | 16 | ||||
-rw-r--r-- | nixos/tests/jenkins.nix | 2 | ||||
-rw-r--r-- | nixos/tests/munin.nix | 1 |
3 files changed, 11 insertions, 8 deletions
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 21840bc67e8f..aab1c4b75efb 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -37,7 +37,7 @@ let --set PATH "/run/current-system/sw/bin:/run/current-system/sw/sbin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" - + # munin uses markers to tell munin-node-configure what a plugin can do echo "#%# family=$family" >> $file echo "#%# capabilities=$cap" >> $file @@ -57,7 +57,7 @@ let rundir /var/run/munin ${cronCfg.extraGlobalConfig} - + ${cronCfg.hosts} ''; @@ -72,10 +72,10 @@ let group root host_name ${config.networking.hostName} setsid 0 - + # wrapped plugins by makeWrapper being with dots ignore_file ^\. - + allow ^127\.0\.0\.1$ ${nodeCfg.extraConfig} @@ -97,7 +97,7 @@ in See <link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />. ''; }; - + extraConfig = mkOption { default = ""; description = '' @@ -118,7 +118,7 @@ in Enable munin-cron. Takes care of all heavy lifting to collect data from nodes and draws graphs to html. Runs munin-update, munin-limits, munin-graphs and munin-html in that order. - + HTML output is in <filename>/var/www/munin/</filename>, configure your favourite webserver to serve static files. ''; @@ -138,7 +138,7 @@ in }; ''; }; - + extraGlobalConfig = mkOption { default = ""; description = '' @@ -160,7 +160,7 @@ in <link xlink:href='http://munin-monitoring.org/wiki/munin.conf' /> ''; }; - + }; }; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 28027c294bc6..f0d3139d902c 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -16,6 +16,8 @@ import ./make-test.nix { services.jenkinsSlave.enable = true; users.extraUsers.jenkins.extraGroups = [ "users" ]; + + systemd.services.jenkins.unitConfig.TimeoutSec = 240; }; slave = diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 31676c10df1b..ddbac590143f 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -19,6 +19,7 @@ import ./make-test.nix { }; }; }; + systemd.services.munin-node.unitConfig.TimeoutSec = 240; }; testScript = '' |