summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-15 14:02:44 +0100
committermakefu <github@syntax-fehler.de>2016-02-15 14:02:44 +0100
commitac31ea80288e2f9ae9eda10d28a912e23bc6647e (patch)
tree9c84be3ca5d2bc6d091a4ba14c4d0141610b7443
parent0457cd1bb9072dbed13ad74d41ffccd04d8dac20 (diff)
s 2 buildbot: use the correct NIX_PATH"
-rw-r--r--shared/2configs/shared-buildbot.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 604cbc5b2..9327d2f95 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -23,13 +23,13 @@
force-scheduler = ''
sched.append(schedulers.ForceScheduler(
name="force",
- builderNames=["full-tests"]))
+ builderNames=["full-tests","fast-tests"]))
'';
fast-tests-scheduler = ''
- # test everything BUT the master real quick
+ # test everything real quick
sched.append(schedulers.SingleBranchScheduler(
## all branches
- change_filter=util.ChangeFilter(branch_re="(?!^master$)"),
+ change_filter=util.ChangeFilter(branch_re=".*"),
# treeStableTimer=10,
name="fast-test-all-branches",
builderNames=["fast-tests"]))
@@ -132,7 +132,7 @@
};
irc = {
enable = true;
- nick = "shared-buildbot";
+ nick = "wolfbot";
server = "cd.retiolum";
channels = [ "retiolum" ];
allowForce = true;
@@ -146,6 +146,7 @@
password = "krebspass";
packages = with pkgs;[ git nix ];
# all nix commands will need a working nixpkgs installation
- extraEnviron = { NIX_PATH="/var/src"; };
+ extraEnviron = {
+ NIX_PATH="nixpkgs=/var/src/upstream-nixpkgs:nixos-config=./shared/1systems/wolf.nix"; };
};
}