From 83e40cd00d40478276d49121163750bb38cc81f3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Aug 2016 11:24:49 +0200 Subject: s 2 buildbot: use make for build-local --- shared/2configs/shared-buildbot.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'shared') diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 58db4c94..a873c8e7 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, -- cgit v1.2.3