From bee0790eabe122ce8a8f7f695d2eaa642d1f7e27 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sun, 1 Feb 2015 18:23:44 -0800
Subject: [PATCH] Try using a ChangeFilter and alwaysUseLatest

---
 buildbot/master.cfg | 64 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 2b0ca313..4cefe7d5 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -13,6 +13,13 @@
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
+wxGitUrl = 'https://github.com/RobinD42/wxWidgets.git'
+wxGitBranch = 'WX_3_0_BRANCH' #'wxPy-3.0-branch'
+
+phoenixGitUrl = 'https://github.com/RobinD42/Phoenix.git'
+phoenixGitBranch = 'master'
+
+
 
 ####### BUILDSLAVES
 
@@ -67,12 +74,22 @@ c['slavePortnum'] = 9989
 from buildbot.schedulers.basic import SingleBranchScheduler
 from buildbot.schedulers.timed import Nightly
 from buildbot.schedulers.forcesched import ForceScheduler
-from buildbot.changes import filter
+from buildbot.changes.filter import ChangeFilter
+
+
+def my_filter_fn(change):
+    if change.repository == phoenixGitUrl and change.branch == phoenixGitBranch:
+        return True
+    if change.repository == wxGitUrl and change.branch == wxGitBranch:
+        return True
+    return False
+my_filter = ChangeFilter(filter_fn=my_filter_fn)
+
 
 c['schedulers'] = []
 c['schedulers'].append( SingleBranchScheduler(
                             name="sched-build",
-                            branch=None,
+                            change_filter=my_filter,
                             treeStableTimer=30,
                             builderNames=["build-win32-py27",
                                           "build-win32-py33",
@@ -89,7 +106,8 @@ c['schedulers'].append( SingleBranchScheduler(
 
 
 c['schedulers'].append( Nightly(
-                            name="sched-dist-1",
+                            name="sched-dist",
+                            change_filter=my_filter,
                             branch=None,
                             hour=21, minute=0,
                             onlyIfChanged=True,
@@ -106,6 +124,7 @@ c['schedulers'].append( Nightly(
 
 c['schedulers'].append( Nightly(
                             name="sched-docs",
+                            change_filter=my_filter,
                             branch=None,
                             hour=1, minute=10,
                             onlyIfChanged=True,
@@ -150,13 +169,6 @@ from buildbot.steps.shell import ShellCommand
 from buildbot.config import BuilderConfig
 
 
-wxGitUrl = 'https://github.com/RobinD42/wxWidgets.git'
-wxGitBranch = 'WX_3_0_BRANCH' #'wxPy-3.0-branch'
-
-phoenixGitUrl = 'https://github.com/RobinD42/Phoenix.git'
-phoenixGitBranch = 'master'
-
-
 def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     factory = BuildFactory()
 
@@ -182,13 +194,20 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     gitConfig = {'core.autocrlf' : 'input'}
     
     # all of them need to fetch the source
-    factory.addStep(Git(repourl=wxGitUrl, branch=wxGitBranch,
-                        name='wx-git', workdir="wxWidgets", config=gitConfig,
-                        mode=mode, method=method, progress=True))
-    factory.addStep(Git(repourl=phoenixGitUrl, branch=phoenixGitBranch, config=gitConfig,
-                        name='phoenix-git', workdir="Phoenix", 
-                        mode=mode, method=method, progress=True))
-
+    factory.addStep(Git(name='wx-git', repourl=wxGitUrl, branch=wxGitBranch,
+                        workdir="wxWidgets", 
+                        config=gitConfig, 
+                        progress=True,
+                        clobberOnFailure=True,    
+                        alwaysUseLatest=True,
+                        mode=mode, method=method))
+    factory.addStep(Git(name='phoenix-git', repourl=phoenixGitUrl, branch=phoenixGitBranch, 
+                        workdir="Phoenix", 
+                        config=gitConfig,
+                        progress=True,
+                        clobberOnFailure=True,
+                        alwaysUseLatest=True,
+                        mode=mode, method=method))
 
     if buildType == 'docs':
         cmd = 'python -u build.py %s setrev dox touch etg sip build wxlib wxtools wxpy ' \
@@ -341,7 +360,9 @@ authz_cfg = authz.Authz(
 )
 
 c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg,
-                                  change_hook_dialects={'github': True},
+                                  change_hook_dialects={
+                                      'base': True,
+                                      'github': True},
                                   change_hook_auth=["file:changehook.passwd"],                                  
                                   ))
 
@@ -380,3 +401,10 @@ c['buildbotURL'] = "http://buildbot.wxpython.org:8010/"
 # installations.
 c['db_url'] = "sqlite:///state.sqlite"
 
+
+
+c['changeHorizon'] = 200
+c['buildHorizon'] = 100
+c['eventHorizon'] = 50
+c['logHorizon'] = 40
+c['buildCacheSize'] = 15