summaryrefslogtreecommitdiffstats
path: root/shared/2configs/buildbot-standalone.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-12-26 10:45:50 +0100
committerlassulus <lass@aidsballs.de>2015-12-26 10:45:50 +0100
commit7aacc397241cc62e88d23d253533fb7d83548b9d (patch)
tree15710b35b6ea4d14f7481fbc41be69eb794c10b0 /shared/2configs/buildbot-standalone.nix
parent6733fa66b46f0d00b7016a92f4ef093ccb7b7a2b (diff)
parentcef2be532b0cc76071b0b3515fc71214b37591f0 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/2configs/buildbot-standalone.nix')
-rw-r--r--shared/2configs/buildbot-standalone.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index baab059c9..51c600329 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -6,11 +6,11 @@ in {
buildbot = pkgs-unst.buildbot;
buildbot-slave = pkgs-unst.buildbot-slave;
};
- networking.firewall.allowedTCPPorts = [ 8010 ];
+ networking.firewall.allowedTCPPorts = [ 8010 9989 ];
krebs.buildbot.master = {
slaves = {
testslave = "krebspass";
- testslave2 = "krebspass";
+ omo = "krebspass";
};
change_source.stockholm = ''
stockholm_repo = 'http://cgit.gum/stockholm'
@@ -33,7 +33,7 @@ in {
name="fast-master-test",
builderNames=["fast-tests"]))
'';
- full-master-scheduler = ''
+ test-cac-infest-master = ''
# files everyone depends on or are part of the share branch
def shared_files(change):
r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)")
@@ -45,6 +45,7 @@ in {
sched.append(schedulers.SingleBranchScheduler(
change_filter=util.ChangeFilter(branch="master"),
fileIsImportant=shared_files,
+ treeStableTimer=60*60, # master was stable for the last hour
name="full-master-test",
builderNames=["full-tests"]))
'';