summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildbot/master.cfg14
1 files changed, 7 insertions, 7 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index a5e97e5..3428bed 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -40,12 +40,12 @@ from buildbot.schedulers.forcesched import *
from buildbot.changes import filter
c['schedulers'] = []
-# git_master = SingleBranchScheduler(
-# name="exchange-master",
-# reason="Commit pushed for one of the sub-projects",
-# change_filter=filter.ChangeFilter(branch='master'),
-# treeStableTimer=600,
-# builderNames=["exchange-test-build"])
+git_master = SingleBranchScheduler(
+ name="exchange-master",
+ reason="Commit pushed for one of the sub-projects",
+ change_filter=filter.ChangeFilter(branch='master'),
+ treeStableTimer=300,
+ builderNames=["exchange-test-build"])
force = ForceScheduler(
name="force-build",
@@ -54,7 +54,7 @@ force = ForceScheduler(
project=FixedParameter(name="project", default=""),
builderNames=["exchange-test-build"])
-c['schedulers'] = [force]
+c['schedulers'] = [force, git_master]
####### BUILDERS