summaryrefslogtreecommitdiffstats
path: root/shared/2configs/shared-buildbot.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-14 09:54:02 +0200
committerlassulus <lass@aidsballs.de>2016-06-14 09:54:02 +0200
commitd5cfc4bf1992f566044861b220243be20d31491c (patch)
treee056a8c441904db72618a09bf7fb5d5c8beec3af /shared/2configs/shared-buildbot.nix
parent371750b8d8a031694e2ffa368f787bfcdb2a9d46 (diff)
parenteb710a17e28bbec2a4f7877533f101fa78ece209 (diff)
Merge remote-tracking branch 'wolf/master'
Diffstat (limited to 'shared/2configs/shared-buildbot.nix')
-rw-r--r--shared/2configs/shared-buildbot.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 5f3b35304..6c40d9966 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -26,7 +26,7 @@
stockholm_repo,
workdir='stockholm-poller', branches=True,
project='stockholm',
- pollinterval=120))
+ pollinterval=60))
'';
scheduler = {
force-scheduler = ''
@@ -43,7 +43,7 @@
sched.append(schedulers.SingleBranchScheduler(
## all branches
change_filter=util.ChangeFilter(branch_re=".*"),
- # treeStableTimer=10,
+ treeStableTimer=10,
name="fast-all-branches",
builderNames=["fast-tests"]))
'';