summaryrefslogtreecommitdiffstats
path: root/shared/2configs/shared-buildbot.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-03-15 14:14:29 +0100
committerlassulus <lass@aidsballs.de>2016-03-15 14:14:29 +0100
commit72939a2d6f45950dbfa6ec0815eae62e83d02630 (patch)
treed35ae568feeb1d1110be316ba8d434308e0aa780 /shared/2configs/shared-buildbot.nix
parentdb3dd77f6de5964bcaa265bf8e5863d7647932f5 (diff)
parent2e317bfe747ec968d3b933ae4c0df68ad204021c (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/2configs/shared-buildbot.nix')
-rw-r--r--shared/2configs/shared-buildbot.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index b474af7b3..9804580db 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -144,7 +144,6 @@
# * retiolum
s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json"))
s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv"))
-
addShell(s, name="infest-cac-centos7",env=env,
sigtermTime=60, # SIGTERM 1 minute before SIGKILL
timeout=10800, # 3h
@@ -173,7 +172,7 @@
masterhost = "localhost";
username = "testslave";
password = "krebspass";
- packages = with pkgs;[ git nix ];
+ packages = with pkgs;[ git nix gnumake jq rsync ];
# all nix commands will need a working nixpkgs installation
extraEnviron = {
NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; };