public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase systemd timeout on Jenkins and Munin tests

Browse Source 
These were timing out a lot.

http://hydra.nixos.org/build/13991108
http://hydra.nixos.org/build/13991107
This commit is contained in:
Eelco Dolstra
2014-09-05 15:50:55 +02:00
parent da4fb08959
commit 59edfd61ad
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/monitoring/munin.nix
+8 -8
View File
@@ -37,7 +37,7 @@ let
--set PATH "/run/current-system/sw/bin:/run/current-system/sw/sbin" \ --set PATH "/run/current-system/sw/bin:/run/current-system/sw/sbin" \
--set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
--set MUNIN_PLUGSTATE "/var/run/munin" --set MUNIN_PLUGSTATE "/var/run/munin"
# munin uses markers to tell munin-node-configure what a plugin can do # munin uses markers to tell munin-node-configure what a plugin can do
echo "#%# family=$family" >> $file echo "#%# family=$family" >> $file
echo "#%# capabilities=$cap" >> $file echo "#%# capabilities=$cap" >> $file
@@ -57,7 +57,7 @@ let
rundir /var/run/munin rundir /var/run/munin
${cronCfg.extraGlobalConfig} ${cronCfg.extraGlobalConfig}
${cronCfg.hosts} ${cronCfg.hosts}
''; '';
@@ -72,10 +72,10 @@ let
group root group root
host_name ${config.networking.hostName} host_name ${config.networking.hostName}
setsid 0 setsid 0
# wrapped plugins by makeWrapper being with dots # wrapped plugins by makeWrapper being with dots
ignore_file ^\. ignore_file ^\.
allow ^127\.0\.0\.1$ allow ^127\.0\.0\.1$
${nodeCfg.extraConfig} ${nodeCfg.extraConfig}
@@ -97,7 +97,7 @@ in
See <link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />. See <link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />.
''; '';
}; };
extraConfig = mkOption { extraConfig = mkOption {
default = ""; default = "";
description = '' description = ''
@@ -118,7 +118,7 @@ in
Enable munin-cron. Takes care of all heavy lifting to collect data from Enable munin-cron. Takes care of all heavy lifting to collect data from
nodes and draws graphs to html. Runs munin-update, munin-limits, nodes and draws graphs to html. Runs munin-update, munin-limits,
munin-graphs and munin-html in that order. munin-graphs and munin-html in that order.
HTML output is in <filename>/var/www/munin/</filename>, configure your HTML output is in <filename>/var/www/munin/</filename>, configure your
favourite webserver to serve static files. favourite webserver to serve static files.
''; '';
@@ -138,7 +138,7 @@ in
}; };
''; '';
}; };
extraGlobalConfig = mkOption { extraGlobalConfig = mkOption {
default = ""; default = "";
description = '' description = ''
@@ -160,7 +160,7 @@ in
<link xlink:href='http://munin-monitoring.org/wiki/munin.conf' /> <link xlink:href='http://munin-monitoring.org/wiki/munin.conf' />
''; '';
}; };
}; };
}; };
nixos/tests/jenkins.nix
+2
View File
@@ -16,6 +16,8 @@ import ./make-test.nix {
services.jenkinsSlave.enable = true; services.jenkinsSlave.enable = true;
users.extraUsers.jenkins.extraGroups = [ "users" ]; users.extraUsers.jenkins.extraGroups = [ "users" ];
systemd.services.jenkins.unitConfig.TimeoutSec = 240;
}; };
slave = slave =
nixos/tests/munin.nix
+1
View File
@@ -19,6 +19,7 @@ import ./make-test.nix {
}; };
}; };
}; };
systemd.services.munin-node.unitConfig.TimeoutSec = 240;
}; };
testScript = '' testScript = ''