[Opensrf-commits] [OpenSRF-GIT] OpenSRF branch master updated. 58e75cc909158e7ddadd39f22c633f711f31a1b4

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  58e75cc909158e7ddadd39f22c633f711f31a1b4 (commit)
      from  47d4ebfc5f1c8d0ccb126eda20e3cb69dd885211 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 58e75cc909158e7ddadd39f22c633f711f31a1b4
Author: Dan Scott <dan at coffeecode.net>
Date:   Mon May 16 18:11:59 2011 -0400

    Specify explicit branches for each builder, lazy-style
    
    SVNPoller was able to rely on change filters to look at every
    commit to the repository and hand them off to the scheduler
    accordingly; GitPoller, however, looks at one branch per
    poller, so we need to instantiate one poller per branch of
    interest. This gives us an opportunity to refactor our approach
    to be more programmatic.
    
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg
index f62e334..6f7ed65 100644
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -27,10 +27,10 @@ c['slaves'] = [
 c['slavePortnum'] = XXX
 
 # Branches and distros to build
-osrf_branches = ('master', 'rel_1_6', 'rel_2_0')
-osrf_distros = [('ubuntu-10.04-x86_64', 'opensrf-slave')]
-eg_branches = ('master', 'rel_1_6_1', 'rel_2_0', 'rel_2_1')
-eg_distros = [
+OSRF_BRANCHES = ('master', 'rel_1_6', 'rel_2_0')
+OSRF_DISTROS = [('ubuntu-10.04-x86_64', 'opensrf-slave')]
+EG_BRANCHES = ('master', '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
@@ -45,18 +45,22 @@ osrf_git = 'git://git.evergreen-ils.org/OpenSRF.git'
 # about source code changes
 
 from buildbot.changes import gitpoller
-c['change_source'] = (
-    gitpoller.GitPoller(
+c['change_source'] = []
+for osrf_branch in OSRF_BRANCHES:
+    c['change_source'].append(gitpoller.GitPoller(
         project='OpenSRF',
         repourl=osrf_git,
-        workdir='/tmp/buildbot_osrf_work'
-    ),
-    gitpoller.GitPoller(
+        workdir='/tmp/buildbot_osrf_' + osrf_branch,
+        branch=osrf_branch
+    ))
+
+for eg_branch in EG_BRANCHES:
+    c['change_source'].append(gitpoller.GitPoller(
         project='Evergreen',
         repourl=eg_git,
-        workdir='/tmp/buildbot_eg_work'
-    )
-)
+        workdir='/tmp/buildbot_eg_' + eg_branch,
+        branch=eg_branch
+    ))
 
 ####### FILTERS
 from buildbot.schedulers.filter import ChangeFilter
@@ -252,13 +256,13 @@ from buildbot.config import BuilderConfig
 
 c['builders'] = []
 
-for branch in osrf_branches:
-    for distro, slave in osrf_distros:
+for branch in OSRF_BRANCHES:
+    for distro, slave in OSRF_DISTROS:
         build = "osrf-%s-%s" % (branch, distro)
         c['builders'].append(BuilderConfig(name=build, slavenames=slave, factory=osrf_factory))
         
-for branch in eg_branches:
-    for distro, slave in eg_distros:
+for branch in EG_BRANCHES:
+    for distro, slave in EG_DISTROS:
         build = "evergreen-%s-%s" % (branch, distro)
         c['builders'].append(BuilderConfig(name=build, slavenames=slave, factory=eg_factory))
 

-----------------------------------------------------------------------

Summary of changes:
 examples/buildbot.cfg |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
OpenSRF