Changeset 82987

Timestamp:

08/22/11 23:56:22 (4 years ago)

Author:

jmr@…

Message:

buildmaster: adapt config to allow easily adding more slave platforms

File:

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

contrib/buildbot/master.cfg

@@ -27 +27 @@
         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
@@ -93 +100 @@
 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(
@@ -98 +108 @@
                             treeStableTimer=None,
                             change_filter = basefilter,
-                            builderNames=["buildbase"]),
+                            builderNames=base_buildernames),
                    SingleBranchScheduler(
                             name="ports",
                             treeStableTimer=None,
                             change_filter = portsfilter,
-                            builderNames=["buildports"])
+                            builderNames=ports_buildernames)
                 ]
 
@@ -215 +225 @@
 from buildbot.config import BuilderConfig
 
-if production:
-    slavenames = slavedata.keys() 
-    baseslaves = filter(lambda x: x.endswith("-base"), slavenames)
-    portsslaves = filter(lambda x: x.endswith("-ports"), slavenames)
+portsslaves = {}
+baseslaves = {}
+if production:
+    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
-
-c['builders']= [
-    BuilderConfig(name="buildbase",
-                  slavenames=baseslaves,
-                  factory=base_factory),
-    BuilderConfig(name="buildports",
-                  slavenames=portsslaves,
-                  factory=ports_factory)
-    ]
+    portsslaves = {build_platforms[0]:slavenames[0]}
+    baseslaves = {build_platforms[0]:slavenames[0]}
+
+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