[81229] contrib/buildbot/master.cfg

[wsiegrist at apple.com]

Revision: 81229
          http://trac.macports.org/changeset/81229
Author:   wsiegrist at apple.com
Date:     2011-07-27 14:27:39 -0700 (Wed, 27 Jul 2011)
Log Message:
-----------
Use a pure ChangeFilter approach to scheduling between the two builders. Also cleanup portlist when we are done.

Modified Paths:
--------------
    contrib/buildbot/master.cfg

Modified: contrib/buildbot/master.cfg
===================================================================
--- contrib/buildbot/master.cfg	2011-07-27 21:17:50 UTC (rev 81228)
+++ contrib/buildbot/master.cfg	2011-07-27 21:27:39 UTC (rev 81229)
@@ -74,7 +74,6 @@
 
 ####### SCHEDULERS
 
-# consider changes to _resources as unimportant
 def change_has_ports(change):
     for f in change.files:
         if "_resources" in f:
@@ -89,22 +88,20 @@
             return True
     return False
         
+from buildbot.changes.filter import ChangeFilter
+portsfilter = ChangeFilter(filter_fn=change_has_ports)
+basefilter = ChangeFilter(filter_fn=change_has_base)
 
-# Configure the Schedulers, which decide how to react to incoming changes.
 from buildbot.schedulers.basic import SingleBranchScheduler
-from buildbot.changes.filter import ChangeFilter
-repofilter = ChangeFilter(repository="/svn/repositories/macports/")
 c['schedulers'] = [SingleBranchScheduler(
                             name="base",
-                            treeStableTimer=10,
-                            fileIsImportant=change_has_base,
-                            change_filter = repofilter,
+                            treeStableTimer=None,
+                            change_filter = basefilter,
                             builderNames=["buildbase"]),
                    SingleBranchScheduler(
                             name="ports",
-                            treeStableTimer=10,
-                            fileIsImportant=change_has_ports,
-                            change_filter = repofilter,
+                            treeStableTimer=None,
+                            change_filter = portsfilter,
                             builderNames=["buildports"])
                 ]
 
@@ -211,7 +208,7 @@
                              },
                         logfiles={"portstatus": "portstatus.log"}))
 # TODO: do we want to upload the individual logs so maintainers can review them?
-ports_factory.addStep(ShellCommand(command="rm -rf ./logs-* ./"+ulpath,
+ports_factory.addStep(ShellCommand(command="rm -rf ./logs-* portlist ./"+ulpath,
                                    name="cleanup",
                                    description="cleanup"))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110727/ba7caa5e/attachment.html>