summaryrefslogtreecommitdiffstats
path: root/shared/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-30 11:05:40 +0100
committerlassulus <lass@aidsballs.de>2015-12-30 11:05:40 +0100
commit7da2e2a22d4649337dde2a717a80a40500b775be (patch)
tree7628c1cc9c6df2ad0ed15f75633e24fefc799a01 /shared/2configs
parent83555272fdcb6ab5ce968b08a90199c8aaeb460b (diff)
parent1798dbaf47fea7793545be2bc78ac5f1c8e27e18 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/2configs')
-rw-r--r--shared/2configs/buildbot-standalone.nix26
1 files changed, 18 insertions, 8 deletions
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 28d1eef2e..c62f8920c 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -8,12 +8,9 @@ in {
};
networking.firewall.allowedTCPPorts = [ 8010 9989 ];
krebs.buildbot.master = {
- secrets = [
- "cac.json"
- ];
+ secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
slaves = {
testslave = "krebspass";
- omo = "krebspass";
};
change_source.stockholm = ''
stockholm_repo = 'http://cgit.gum/stockholm'
@@ -76,15 +73,27 @@ 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="instantiate-test-all-modules",env=env,
+ command=nixshell + \
+ ["touch retiolum.rsa_key.priv; \
+ nix-instantiate --eval -A \
+ users.shared.test-all-krebs-modules.system \
+ -I stockholm=. \
+ -I secrets=. '<stockholm>' \
+ --argstr current-date lol \
+ --argstr current-user-name shared \
+ --argstr current-host-name lol \
+ --strict --json"])
+
bu.append(util.BuilderConfig(name="fast-tests",
slavenames=slavenames,
factory=f))
@@ -101,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",
@@ -128,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>}"; };
};
}