From 5f5c84e7b62a517d45d2a9b210c98c02efbd4fdc Mon Sep 17 00:00:00 2001 From: dbs Date: Mon, 28 Mar 2011 18:51:53 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@2218 9efc2488-bf62-4759-914b-345cdb29e865 --- examples/buildbot.cfg | 88 +++++++++++-------------------------------- 1 file changed, 21 insertions(+), 67 deletions(-) diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg index 60d4652..aa9be37 100644 --- a/examples/buildbot.cfg +++ b/examples/buildbot.cfg @@ -26,6 +26,16 @@ c['slaves'] = [ # --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,72 +257,16 @@ eg_factory.addStep(python.PyLint( 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)) - -# 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)) + +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) ####### STATUS TARGETS @@ -326,7 +280,7 @@ from buildbot.status import html 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 -- 2.43.2