[82987] contrib/buildbot/master.cfg

[jmr at macports.org]

Revision: 82987
          http://trac.macports.org/changeset/82987
Author:   jmr at macports.org
Date:     2011-08-22 23:56:22 -0700 (Mon, 22 Aug 2011)
Log Message:
-----------
buildmaster: adapt config to allow easily adding more slave platforms

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

Modified: contrib/buildbot/master.cfg
===================================================================
--- contrib/buildbot/master.cfg	2011-08-23 05:41:31 UTC (rev 82986)
+++ contrib/buildbot/master.cfg	2011-08-23 06:56:22 UTC (rev 82987)
@@ -27,6 +27,13 @@
         production = configdata['production']
         privkey = configdata['privkey']
 
+# platforms we are building for
+if production:
+    # this list should get longer in future
+    build_platforms = ["snowleopard-x86_64"]
+else:
+    build_platforms = ["snowleopard-x86_64"]
+
 ####### BUILDSLAVES
 
 # The 'slaves' list defines the set of recognized buildslaves. Each element is
@@ -92,17 +99,20 @@
 portsfilter = ChangeFilter(filter_fn=change_has_ports)
 basefilter = ChangeFilter(filter_fn=change_has_base)
 
+base_buildernames = ["buildports-"+plat for plat in build_platforms]
+ports_buildernames = ["buildbase-"+plat for plat in build_platforms]
+
 from buildbot.schedulers.basic import SingleBranchScheduler
 c['schedulers'] = [SingleBranchScheduler(
                             name="base",
                             treeStableTimer=None,
                             change_filter = basefilter,
-                            builderNames=["buildbase"]),
+                            builderNames=base_buildernames),
                    SingleBranchScheduler(
                             name="ports",
                             treeStableTimer=None,
                             change_filter = portsfilter,
-                            builderNames=["buildports"])
+                            builderNames=ports_buildernames)
                 ]
 
 ####### BUILDERS
@@ -214,23 +224,28 @@
 
 from buildbot.config import BuilderConfig
 
+portsslaves = {}
+baseslaves = {}
 if production:
-    slavenames = slavedata.keys() 
-    baseslaves = filter(lambda x: x.endswith("-base"), slavenames)
-    portsslaves = filter(lambda x: x.endswith("-ports"), slavenames)
+    slavenames = slavedata.keys()
+    for plat in build_platforms:
+        baseslaves[plat] = filter(lambda x: x.endswith(plat+"-base"), slavenames)
+        portsslaves[plat] = filter(lambda x: x.endswith(plat+"-ports"), slavenames)
 else:
     slavenames = ["snowleopard-x86_64"]
-    baseslaves = slavenames
-    portsslaves = slavenames
+    portsslaves = {build_platforms[0]:slavenames[0]}
+    baseslaves = {build_platforms[0]:slavenames[0]}
 
-c['builders']= [
-    BuilderConfig(name="buildbase",
-                  slavenames=baseslaves,
-                  factory=base_factory),
-    BuilderConfig(name="buildports",
-                  slavenames=portsslaves,
-                  factory=ports_factory)
-    ]
+c['builders']=[]
+for plat in build_platforms:
+    c['builders']+= [
+        BuilderConfig(name="buildbase-"+plat,
+                      slavenames=baseslaves[plat],
+                      factory=base_factory),
+        BuilderConfig(name="buildports-"+plat,
+                      slavenames=portsslaves[plat],
+                      factory=ports_factory)
+        ]
 
 ####### STATUS TARGETS
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110822/58d4c2b4/attachment.html>