summaryrefslogtreecommitdiffstats
path: root/shared/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-12-30 04:43:16 +0100
committermakefu <github@syntax-fehler.de>2015-12-30 04:43:16 +0100
commit2bee6a0f6d71fbb1e1f02bd0df396bc38d3b6f67 (patch)
tree39d0ee960d4a4f278bdc7c1ffe62001dd3b1a60a /shared/2configs
parenta8cb9d41bdefe8a5dc72ca76b3ebc5b4047ddf65 (diff)
s 2 buildbot-standalone: cosmetics
Diffstat (limited to 'shared/2configs')
-rw-r--r--shared/2configs/buildbot-standalone.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 22e9861cc..c62f8920c 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -73,16 +73,16 @@ in {
fast-tests = ''
f = util.BuildFactory()
f.addStep(grab_repo)
- addShell(f,name="centos7-eval",env=env,
+ addShell(f,name="deploy-eval-centos7",env=env,
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=test-centos7"])
- addShell(f,name="wolf-eval",env=env,
+ addShell(f,name="deploy-eval-wolf",env=env,
command=nixshell + ["make -s eval get=krebs.deploy filter=json system=wolf"])
- addShell(f,name="eval-cross-check",env=env,
+ addShell(f,name="deploy-eval-cross-check",env=env,
command=nixshell + ["! make eval get=krebs.deploy filter=json system=test-failing"])
- addShell(f,name="instaniate-test-all-modules",env=env,
+ addShell(f,name="instantiate-test-all-modules",env=env,
command=nixshell + \
["touch retiolum.rsa_key.priv; \
nix-instantiate --eval -A \
@@ -110,7 +110,7 @@ in {
addShell(s, name="infest-cac-centos7",env=env,
sigtermTime=60, # SIGTERM 1 minute before SIGKILL
- timeout=5400, # 1.5h timeout
+ timeout=7200, # 2h
command=nixshell + ["infest-cac-centos7"])
bu.append(util.BuilderConfig(name="full-tests",
@@ -137,6 +137,7 @@ in {
username = "testslave";
password = "krebspass";
packages = with pkgs;[ git nix ];
+ # all nix commands will need a working nixpkgs installation
extraEnviron = { NIX_PATH="nixpkgs=${toString <nixpkgs>}"; };
};
}