summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-03 08:19:47 +0200
committerlassulus <lass@aidsballs.de>2016-08-03 08:19:47 +0200
commitc1957eb83f64d3910c7680d3f4048d7da1b486f5 (patch)
treec8be84eec83536009fe1ba35e8415f907aa2df5f /lass
parent3b2b4bdfb96d3f108e7f96e61f67fc4f4b71b7b3 (diff)
l 2 buildbot: use make for fast-tests
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/buildbot-standalone.nix41
1 files changed, 31 insertions, 10 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 766fd715e..1db3ffd1f 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -66,6 +66,11 @@ in {
"NIX_REMOTE": "daemon",
"dummy_secrets": "true",
}
+ env_shared = {
+ "LOGNAME": "shared",
+ "NIX_REMOTE": "daemon",
+ "dummy_secrets": "true",
+ }
# prepare nix-shell
# the dependencies which are used by the test script
@@ -114,19 +119,35 @@ in {
fast-tests = ''
f = util.BuildFactory()
f.addStep(grab_repo)
- for i in [ "prism", "mors", "echelon" ]:
- addShell(f,name="populate-{}".format(i),env=env_lass,
+ for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
+ addShell(f,name="build-{}".format(i),env=env_lass,
+ command=nixshell + \
+ ["make \
+ test \
+ ssh=${sshWrapper} \
+ target=build@localhost${config.users.users.build.home}/testbuild \
+ method=eval \
+ system={}".format(i)])
+
+ for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
+ addShell(f,name="build-{}".format(i),env=env_makefu,
command=nixshell + \
- ["{}(make system={} populate debug=true)".format("!" if "failing" in i else "",i)])
+ ["make \
+ test \
+ ssh=${sshWrapper} \
+ target=build@localhost${config.users.users.build.home}/testbuild \
+ method=eval \
+ system={}".format(i)])
- addShell(f,name="build-test-minimal",env=env_lass,
+ for i in [ "test-minimal-deploy" ]:
+ addShell(f,name="build-{}".format(i),env=env_shared,
command=nixshell + \
- ["nix-instantiate \
- --show-trace --eval --strict --json \
- -I nixos-config=./shared/1systems/test-minimal-deploy.nix \
- -I secrets=. \
- -A config.system.build.toplevel"]
- )
+ ["make \
+ test \
+ ssh=${sshWrapper} \
+ target=build@localhost${config.users.users.build.home}/testbuild \
+ method=eval \
+ system={}".format(i)])
bu.append(util.BuilderConfig(name="fast-tests",
slavenames=slavenames,