summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-07 11:24:49 +0200
committerlassulus <lass@aidsballs.de>2016-08-07 11:24:49 +0200
commit83e40cd00d40478276d49121163750bb38cc81f3 (patch)
tree14ab9444ea98fda3f9e935e893960a20af4f5ea4
parent2a259d83c17905b5aeee5191ac68d408d3bc799e (diff)
s 2 buildbot: use make for build-local
-rw-r--r--shared/2configs/shared-buildbot.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 58db4c94c..a873c8e73 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -120,14 +120,14 @@
f.addStep(grab_repo)
addShell(f,name="build-test-all-modules",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"]
- )
+ command=nixshell + \
+ ["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=test-all-krebs-modules"]
+ )
bu.append(util.BuilderConfig(name="build-local",
slavenames=slavenames,