Changeset 81229

Timestamp:

07/27/11 14:27:39 (4 years ago)

Author:

wsiegrist@…

Message:

Use a pure ChangeFilter approach to scheduling between the two builders. Also cleanup portlist when we are done.

File:

• contrib/buildbot/master.cfg (modified) (3 diffs)

contrib/buildbot/master.cfg

@@ -75 +75 @@
 ####### SCHEDULERS
 
-# consider changes to _resources as unimportant
 def change_has_ports(change):
     for f in change.files:
@@ -90 +89 @@
     return False
         
-
-# Configure the Schedulers, which decide how to react to incoming changes.
+from buildbot.changes.filter import ChangeFilter
+portsfilter = ChangeFilter(filter_fn=change_has_ports)
+basefilter = ChangeFilter(filter_fn=change_has_base)
+
 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"])
                 ]
@@ -212 +209 @@
                         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"))