[Opensrf-commits] r2218 - trunk/examples (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2011-03-28 14:51:53 -0400 (Mon, 28 Mar 2011)
New Revision: 2218

Modified:
   trunk/examples/buildbot.cfg
Log:
Get more DRY; generate builders from a small list of branches and distros

Should adopt this approach with schedulers too, but one step at a time.


Modified: trunk/examples/buildbot.cfg
===================================================================
--- trunk/examples/buildbot.cfg	2011-03-28 15:22:54 UTC (rev 2217)
+++ trunk/examples/buildbot.cfg	2011-03-28 18:51:53 UTC (rev 2218)
@@ -26,6 +26,16 @@
 # --master option)
 c['slavePortnum'] = XXX
 
+# Branches and distros to build
+osrf_branches = ('trunk', 'rel_1_6', 'rel_2_0')
+osrf_distros = ({'ubuntu-10.04-x86_64': 'opensrf-slave'})
+eg_branches = ('trunk', 'rel_1_6_1', 'rel_2_0', 'rel_2_1')
+eg_distros = (
+    {'debian-6.00-x86_64': 'eg-slave'}, # UPEI
+    {'ubuntu-8.04-x86': 'eg-u804'},     # GPLS
+    {'ubuntu-10.04-x86': 'eg-u1004'}    # GPLS
+)
+
 ####### CHANGESOURCES
 
 # the 'change_source' setting tells the buildmaster how it should find out
@@ -247,73 +257,17 @@
 from buildbot.config import BuilderConfig
 
 c['builders'] = []
-c['builders'].append(
-    BuilderConfig(name="osrf-trunk-ubuntu-10.04-x86_64",
-      slavenames=["opensrf-slave"],
-      factory=osrf_factory))
-c['builders'].append(
-    BuilderConfig(name="osrf-rel_1_6-ubuntu-10.04-x86_64",
-      slavenames=["opensrf-slave"],
-      factory=osrf_factory))
-c['builders'].append(
-    BuilderConfig(name="osrf-rel_2_0-ubuntu-10.04-x86_64",
-      slavenames=["opensrf-slave"],
-      factory=osrf_factory))
 
-# UPEI Debian 6.00
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_1_6_1-debian-6.00-x86_64",
-      slavenames=["eg-slave"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_2_0-debian-6.00-x86_64",
-      slavenames=["eg-slave"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_2_1-debian-6.00-x86_64",
-      slavenames=["eg-slave"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-trunk-debian-6.00-x86_64",
-      slavenames=["eg-slave"],
-      factory=eg_factory))
+for branch in osrf_branches:
+    for distro, slave in osrf_distros:
+        build = "osrf-%s-%s" % (branch, distro)
+        c['builders'].append(name=build, slavenames=slave, factory=osrf_factory)
+        
+for branch in eg_branches:
+    for distro, slave in eg_distros:
+        build = "evergreen-%s-%s" % (branch, distro)
+        c['builders'].append(name=build, slavenames=slave, factory=eg_factory)
 
-# GPLS Ubuntu 8.04
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_1_6_1-ubuntu-8.04-x86",
-      slavenames=["eg-u804"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_2_0-ubuntu-8.04-x86",
-      slavenames=["eg-u804"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_2_1-ubuntu-8.04-x86",
-      slavenames=["eg-u804"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-trunk-ubuntu-8.04-x86",
-      slavenames=["eg-u804"],
-      factory=eg_factory))
-
-# GPLS Ubuntu 8.04
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_1_6_1-ubuntu-10.04-x86",
-      slavenames=["eg-u1004"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_2_0-ubuntu-10.04-x86",
-      slavenames=["eg-u1004"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-rel_2_1-ubuntu-10.04-x86",
-      slavenames=["eg-u1004"],
-      factory=eg_factory))
-c['builders'].append(
-    BuilderConfig(name="evergreen-trunk-ubuntu-10.04-x86",
-      slavenames=["eg-u1004"],
-      factory=eg_factory))
-
 ####### STATUS TARGETS
 
 # 'status' is a list of Status Targets. The results of each build will be
@@ -326,7 +280,7 @@
 from buildbot.status.web import auth, authz
 
 users = [('XXX', 'XXX'), ('XXX', 'XXX')]
-authz_cfg=authz.Authz(
+authz_cfg = authz.Authz(
     auth=auth.BasicAuth(users),
     # change any of these to True to enable; see the manual for more
     # options