[OpenSRF-GIT] OpenSRF branch master updated. bb5018f1bf16fd9bb9e61b43286dbf0a6257bf5b

[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  bb5018f1bf16fd9bb9e61b43286dbf0a6257bf5b (commit)
      from  72e4f650e64328d153962c9da08305c54741be37 (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 bb5018f1bf16fd9bb9e61b43286dbf0a6257bf5b
Author: Dan Scott <dscott at laurentian.ca>
Date:   Wed May 23 00:50:49 2012 -0400

    Remove Evergreen 2.0 from automated builds
    
    rel_2_0 is no longer in support, thus it's time to remove it from the
    automated testing builds.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg
index 84920d4..e9eb832 100644
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -33,7 +33,7 @@ c['slavePortnum'] = XXX
 # Branches and distros to build
 OSRF_BRANCHES = ('master', 'rel_2_1', 'rel_2_0')
 OSRF_DISTROS = [('ubuntu-10.04-x86_64', 'opensrf-slave')]
-EG_BRANCHES = ('master', 'rel_2_2', 'rel_2_0', 'rel_2_1')
+EG_BRANCHES = ('master', 'rel_2_2', 'rel_2_1')
 EG_DISTROS = [
     ('debian-6.00-x86_64', 'eg-slave'), # UPEI
     ('ubuntu-10.04-x86', 'eg-u1004')    # GPLS
@@ -70,7 +70,6 @@ from buildbot.changes.filter import ChangeFilter
 master_filter = ChangeFilter(project='OpenSRF', branch="master")
 rel_2_0_filter = ChangeFilter(project='OpenSRF', branch="rel_2_0")
 rel_2_1_filter = ChangeFilter(project='OpenSRF', branch="rel_2_1")
-eg_rel_2_0_filter = ChangeFilter(project='Evergreen', branch="rel_2_0")
 eg_rel_2_1_filter = ChangeFilter(project='Evergreen', branch="rel_2_1")
 eg_rel_2_2_filter = ChangeFilter(project='Evergreen', branch="rel_2_2")
 eg_master_filter = ChangeFilter(project='Evergreen', branch="master")
@@ -105,14 +104,6 @@ c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_2_2",
                 "evergreen-rel_2_2-ubuntu-10.04-x86"
             ]))
 
-c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_2_0",
-            treeStableTimer=300,
-            change_filter=eg_rel_2_0_filter,
-            builderNames=[
-                "evergreen-rel_2_0-debian-6.00-x86_64",
-                "evergreen-rel_2_0-ubuntu-10.04-x86"
-            ]))
-
 c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_2_1",
             treeStableTimer=300,
             change_filter=eg_rel_2_1_filter,
@@ -132,9 +123,7 @@ c['schedulers'].append(SingleBranchScheduler(name="evergreen-master",
 #### Build step tests
 def eg_requires_autogen(step):
     'Old versions of Evergreen require autogen.sh to bootstrap'
-    if (step.build.getProperty('branch') == 'rel_2_0' or
-        step.build.getProperty('branch') == 'rel_2_1'
-    ):
+    if (step.build.getProperty('branch') == 'rel_2_1'):
         return True
     return False
 
@@ -190,7 +179,7 @@ osrf_factory.addStep(
 )
 
 osrf_factory.addStep(
-    shell.ShellCommand(command=["autoreconf", "-f", "-i"],
+    shell.ShellCommand(command=["autoreconf", "-i"],
         doStepIf=osrf_requires_autoreconf,
         name="Bootstrap via autoreconf"
     )

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

Summary of changes:
 examples/buildbot.cfg |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
OpenSRF