s 2 buildbot: use the correct NIX_PATH"
This commit is contained in:
parent
0457cd1bb9
commit
ac31ea8028
|
@ -23,13 +23,13 @@
|
||||||
force-scheduler = ''
|
force-scheduler = ''
|
||||||
sched.append(schedulers.ForceScheduler(
|
sched.append(schedulers.ForceScheduler(
|
||||||
name="force",
|
name="force",
|
||||||
builderNames=["full-tests"]))
|
builderNames=["full-tests","fast-tests"]))
|
||||||
'';
|
'';
|
||||||
fast-tests-scheduler = ''
|
fast-tests-scheduler = ''
|
||||||
# test everything BUT the master real quick
|
# test everything real quick
|
||||||
sched.append(schedulers.SingleBranchScheduler(
|
sched.append(schedulers.SingleBranchScheduler(
|
||||||
## all branches
|
## all branches
|
||||||
change_filter=util.ChangeFilter(branch_re="(?!^master$)"),
|
change_filter=util.ChangeFilter(branch_re=".*"),
|
||||||
# treeStableTimer=10,
|
# treeStableTimer=10,
|
||||||
name="fast-test-all-branches",
|
name="fast-test-all-branches",
|
||||||
builderNames=["fast-tests"]))
|
builderNames=["fast-tests"]))
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
};
|
};
|
||||||
irc = {
|
irc = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nick = "shared-buildbot";
|
nick = "wolfbot";
|
||||||
server = "cd.retiolum";
|
server = "cd.retiolum";
|
||||||
channels = [ "retiolum" ];
|
channels = [ "retiolum" ];
|
||||||
allowForce = true;
|
allowForce = true;
|
||||||
|
@ -146,6 +146,7 @@
|
||||||
password = "krebspass";
|
password = "krebspass";
|
||||||
packages = with pkgs;[ git nix ];
|
packages = with pkgs;[ git nix ];
|
||||||
# all nix commands will need a working nixpkgs installation
|
# 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"; };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue