Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s 2 buildbot: add treestabletimer

Browse Source
This commit is contained in:
makefu 2015-12-24 20:50:23 +01:00
parent 9ae6642093
commit 1ff8d0b8c5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/2configs/base.nix
View File

@ -19,6 +19,7 @@ with lib;
git.nixpkgs = { git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/NixOS/nixpkgs;
rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80"; rev = "6d31e9b81dcd4ab927bb3dc91b612dd5abfa2f80";
target-path = "/var/src/nixpkgs";
}; };
dir.secrets = { dir.secrets = {
host = config.krebs.current.host; host = config.krebs.current.host;
@ -27,6 +28,7 @@ with lib;
dir.stockholm = { dir.stockholm = {
host = config.krebs.current.host; host = config.krebs.current.host;
path = mkDefault "${getEnv "HOME"}/stockholm"; path = mkDefault "${getEnv "HOME"}/stockholm";
target-path = "/var/src/stockholm";
}; };
}; };

7
shared/2configs/buildbot-standalone.nix
View File

@ -6,11 +6,11 @@ in {
buildbot = pkgs-unst.buildbot; buildbot = pkgs-unst.buildbot;
buildbot-slave = pkgs-unst.buildbot-slave; buildbot-slave = pkgs-unst.buildbot-slave;
}; };
networking.firewall.allowedTCPPorts = [ 8010 ]; networking.firewall.allowedTCPPorts = [ 8010 9989 ];
krebs.buildbot.master = { krebs.buildbot.master = {
slaves = { slaves = {
testslave = "krebspass"; testslave = "krebspass";
testslave2 = "krebspass"; omo = "krebspass";
}; };
change_source.stockholm = '' change_source.stockholm = ''
stockholm_repo = 'http://cgit.gum/stockholm' stockholm_repo = 'http://cgit.gum/stockholm'
@ -33,7 +33,7 @@ in {
name="fast-master-test", name="fast-master-test",
builderNames=["fast-tests"])) builderNames=["fast-tests"]))
''; '';
full-master-scheduler = '' test-cac-infest-master = ''
# files everyone depends on or are part of the share branch # files everyone depends on or are part of the share branch
def shared_files(change): def shared_files(change):
r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)") r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)")
@ -45,6 +45,7 @@ in {
sched.append(schedulers.SingleBranchScheduler( sched.append(schedulers.SingleBranchScheduler(
change_filter=util.ChangeFilter(branch="master"), change_filter=util.ChangeFilter(branch="master"),
fileIsImportant=shared_files, fileIsImportant=shared_files,
treeStableTimer=60*60, # master was stable for the last hour
name="full-master-test", name="full-master-test",
builderNames=["full-tests"])) builderNames=["full-tests"]))
''; '';