[llvm-commits] [zorg] r144022 - /zorg/trunk/buildbot/osuosl/master/master.cfg

[Galina Kistanova]

Author: gkistanova
Date: Mon Nov  7 15:46:58 2011
New Revision: 144022

URL: http://llvm.org/viewvc/llvm-project?rev=144022&view=rev
Log:
Add project-specific schedulers.

Modified:
    zorg/trunk/buildbot/osuosl/master/master.cfg

Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=144022&r1=144021&r2=144022&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Mon Nov  7 15:46:58 2011
@@ -31,39 +31,21 @@
 
 ####### CHANGESOURCES
 
-from buildbot.changes.svnpoller import SVNPoller
 from buildbot.changes.pb import PBChangeSource
+from zorg.buildbot.changes.llvmpoller import LLVMPoller
 
-import buildbot.changes.svnpoller
-
-class LLVMPoller(buildbot.changes.svnpoller.SVNPoller):
-  def __init__(self, project, pollinterval=120, histmax=10):
-    buildbot.changes.svnpoller.SVNPoller.__init__(self, 
-                                                  'http://llvm.org/svn/llvm-project/%s' % project,
-                                                  pollinterval=pollinterval,
-                                                  histmax=histmax,
-                                                  revlinktmpl='http://llvm.org/viewvc/llvm-project/?view=rev&revision=%s')
 c['change_source'] = [PBChangeSource()]
-if True:
-  c['change_source'].append(LLVMPoller("llvm/trunk"))
-  c['change_source'].append(LLVMPoller("cfe/trunk"))
-  c['change_source'].append(LLVMPoller("polly/trunk"))
-  c['change_source'].append(LLVMPoller("llvm-gcc-4.2/trunk"))
-  c['change_source'].append(LLVMPoller("compiler-rt/trunk"))
-  c['change_source'].append(LLVMPoller("dragonegg/trunk"))
-  c['change_source'].append(LLVMPoller("lldb/trunk"))
-#  c['change_source'].append(LLVMPoller("test-suite/trunk"))
-
-####### BUILDERS
 
-c['builders'] = builders = list(config.builders.get_builders())
+c['change_source'].append(LLVMPoller(projects=[
+    "llvm",
+    "cfe",
+    "polly",
+    "llvm-gcc-4.2",
+    "compiler-rt",
+    "dragonegg",
+    "lldb"]))
 
-####### STATUS TARGETS
-
-# Schedule builds and email for all non-experimental builders.
-standard_builders = [b['name'] for b in builders
-                     if not b['category'].endswith('.exp')]
-c['status'] = config.status.get_status_targets(standard_builders)
+#  c['change_source'].append(LLVMPoller("test-suite", "trunk"))
 
 ####### RESOURCE USAGE
 
@@ -82,12 +64,77 @@
 # Use gzip instead of bz2, to reduce server load.
 c['logCompressionMethod'] = 'gz'
 
+####### BUILDERS
+
+c['builders'] = builders = list(config.builders.get_builders())
+
+####### STATUS TARGETS
+
+# Schedule builds and email for all non-experimental builders.
+standard_builders = [b['name'] for b in builders
+                     if not b['category'].endswith('.exp')]
+c['status'] = config.status.get_status_targets(standard_builders)
+
 ####### SCHEDULERS
 
 from buildbot.scheduler import Scheduler
-c['schedulers'] = [Scheduler(name="all",branch=None,
-                             treeStableTimer=2*60,
-                             builderNames=standard_builders)]
+from buildbot.schedulers.filter import ChangeFilter
+from buildbot.schedulers.basic import SingleBranchScheduler
+
+def depends_on(projects):
+    """
+    Returns a ChangeFilter for the given projects.
+    """
+    return ChangeFilter(project=projects)
+
+def get_all_for(category):
+    """
+    Returns a list of builder names for the given category.
+    """
+    return [
+        b['name'] for b in builders
+                  if b['category'] == category]
+
+
+c['schedulers'] = [SingleBranchScheduler(name="llvm_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("llvm"),
+                            change_filter=depends_on(
+                                "llvm"))]
+
+c['schedulers'].append(SingleBranchScheduler(name="llvmgcc_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("llvm-gcc"),
+                            change_filter=depends_on([
+                                "llvm",
+                                "llvm-gcc-4.2"])))
+
+c['schedulers'].append(SingleBranchScheduler(name="dragonegg_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("dragonegg"),
+                            change_filter=depends_on([
+                                "llvm",
+                                "dragonegg"])))
+
+c['schedulers'].append(SingleBranchScheduler(name="clang_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("clang"),
+                            change_filter=depends_on([
+                                "llvm",
+                                "cfe"])))
+
+c['schedulers'].append(SingleBranchScheduler(name="polly_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("polly"),
+                            change_filter=depends_on([
+                                "llvm",
+                                "polly"])))
+
+c['schedulers'].append(SingleBranchScheduler(name="lldb_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("lldb"),
+                            change_filter=depends_on(
+                                "lldb")))
 
 ####### PROJECT IDENTITY