diff options
| author | tv <tv@krebsco.de> | 2016-08-21 13:02:40 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-08-21 13:02:40 +0200 |
| commit | 315dde2dcf063c18f54ddfaf65bd7c3dce95d161 (patch) | |
| tree | 88dd3b15a0d8df30e26d731fa8be6781e3677ae9 /shared/2configs | |
| parent | 509a9f4ff47bd40856754b9440f07f9e7fa0f452 (diff) | |
| parent | 1d9f7b4f2d1a444bb7b19f18efa3bee63c8d3770 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'shared/2configs')
| -rw-r--r-- | shared/2configs/shared-buildbot.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 58db4c94c..22144e9ec 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -119,15 +119,15 @@ f = util.BuildFactory() f.addStep(grab_repo) - addShell(f,name="build-test-all-modules",env=env, + for i in [ "test-all-krebs-modules", "wolf" ]: + addShell(f,name="build-{}".format(i),env=env, command=nixshell + \ - ["touch retiolum.rsa_key.priv; \ - nix-build \ - --show-trace --no-out-link \ - -I nixos-config=./shared/1systems/test-all-krebs-modules.nix \ - -I secrets=. \ - -A config.system.build.toplevel"] - ) + ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + make \ + test \ + target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \ + method=build \ + system={}".format(i)]) bu.append(util.BuilderConfig(name="build-local", slavenames=slavenames, |