From bb5018f1bf16fd9bb9e61b43286dbf0a6257bf5b Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Wed, 23 May 2012 00:50:49 -0400 Subject: [PATCH] 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 --- examples/buildbot.cfg | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) 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" ) -- 2.43.2