[OpenSRF-GIT] OpenSRF branch master updated. d1c53813c3b6cbe8751123c6e32dd829d1895194
Evergreen Git
git at git.evergreen-ils.org
Sun Apr 8 14:55:52 EDT 2012
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 d1c53813c3b6cbe8751123c6e32dd829d1895194 (commit)
from 1f33f1e7d61ea279ecc62c33c391bad941c2a70b (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 d1c53813c3b6cbe8751123c6e32dd829d1895194
Author: Dan Scott <dan at coffeecode.net>
Date: Sun Apr 8 14:53:36 2012 -0400
Updated buildbot.cfg for current build environments
* Drop Ubuntu 8.04 from the list of build environments.
* OpenSRF: drop rel_1_6, add rel_2_1
* Evergreen: drop rel_1_6_1, add rel_2_2
* Adjust for buildbot 0.86 API changes to avoid deprecation
* Improve PEP8 compliance
Signed-off-by: Dan Scott <dan at coffeecode.net>
diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg
index 4361a32..253e478 100644
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -22,7 +22,6 @@ from buildbot.buildslave import BuildSlave
c['slaves'] = [
BuildSlave("opensrf-slave", "XXX", max_builds=1),
BuildSlave("eg-slave", "XXX", max_builds=1),
- BuildSlave("eg-u804", "XXX", max_builds=1),
BuildSlave("eg-u1004", "XXX", max_builds=1)
]
@@ -32,12 +31,11 @@ c['slaves'] = [
c['slavePortnum'] = XXX
# Branches and distros to build
-OSRF_BRANCHES = ('master', 'rel_1_6', 'rel_2_0')
+OSRF_BRANCHES = ('master', 'rel_2_1', '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_BRANCHES = ('master', 'rel_2_2', '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
]
@@ -68,13 +66,13 @@ for eg_branch in EG_BRANCHES:
))
####### FILTERS
-from buildbot.schedulers.filter import ChangeFilter
+from buildbot.changes.filter import ChangeFilter
master_filter = ChangeFilter(project='OpenSRF', branch="master")
-rel_1_6_filter = ChangeFilter(project='OpenSRF', branch="rel_1_6")
rel_2_0_filter = ChangeFilter(project='OpenSRF', branch="rel_2_0")
-eg_rel_1_6_1_filter = ChangeFilter(project='Evergreen', branch="rel_1_6_1")
+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")
####### SCHEDULERS
@@ -82,30 +80,29 @@ eg_master_filter = ChangeFilter(project='Evergreen', branch="master")
# Configure the Schedulers, which decide how to react to incoming changes. In this
# case, just kick off a 'runtests' build
-from buildbot.scheduler import SingleBranchScheduler
+from buildbot.schedulers.basic import SingleBranchScheduler
c['schedulers'] = []
c['schedulers'].append(SingleBranchScheduler(name="osrf-master-full",
treeStableTimer=300,
change_filter=master_filter,
builderNames=["osrf-master-ubuntu-10.04-x86_64"]))
-c['schedulers'].append(SingleBranchScheduler(name="osrf-rel_1_6",
+c['schedulers'].append(SingleBranchScheduler(name="osrf-rel_2_1",
treeStableTimer=300,
- change_filter=rel_1_6_filter,
- builderNames=["osrf-rel_1_6-ubuntu-10.04-x86_64"]))
+ change_filter=rel_2_1_filter,
+ builderNames=["osrf-rel_2_1-ubuntu-10.04-x86_64"]))
c['schedulers'].append(SingleBranchScheduler(name="osrf-rel_2_0",
treeStableTimer=300,
change_filter=rel_2_0_filter,
builderNames=["osrf-rel_2_0-ubuntu-10.04-x86_64"]))
-c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_1_6_1",
+c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_2_2",
treeStableTimer=300,
- change_filter=eg_rel_1_6_1_filter,
+ change_filter=eg_rel_2_2_filter,
builderNames=[
- "evergreen-rel_1_6_1-debian-6.00-x86_64",
- "evergreen-rel_1_6_1-ubuntu-8.04-x86",
- "evergreen-rel_1_6_1-ubuntu-10.04-x86"
+ "evergreen-rel_2_2-debian-6.00-x86_64",
+ "evergreen-rel_2_2-ubuntu-10.04-x86"
]))
c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_2_0",
@@ -113,7 +110,6 @@ c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_2_0",
change_filter=eg_rel_2_0_filter,
builderNames=[
"evergreen-rel_2_0-debian-6.00-x86_64",
- "evergreen-rel_2_0-ubuntu-8.04-x86",
"evergreen-rel_2_0-ubuntu-10.04-x86"
]))
@@ -122,7 +118,6 @@ c['schedulers'].append(SingleBranchScheduler(name="evergreen-rel_2_1",
change_filter=eg_rel_2_1_filter,
builderNames=[
"evergreen-rel_2_1-debian-6.00-x86_64",
- "evergreen-rel_2_1-ubuntu-8.04-x86",
"evergreen-rel_2_1-ubuntu-10.04-x86"
]))
@@ -131,7 +126,6 @@ c['schedulers'].append(SingleBranchScheduler(name="evergreen-master",
change_filter=eg_master_filter,
builderNames=[
"evergreen-master-debian-6.00-x86_64",
- "evergreen-master-ubuntu-8.04-x86",
"evergreen-master-ubuntu-10.04-x86"
]))
@@ -166,12 +160,7 @@ osrf_factory.addStep(shell.Compile(command=["make"]))
# run the Perl unit tests
osrf_factory.addStep(shell.PerlModuleTest(workdir="build/src/perl"))
-# run the Python unit tests (available after rel_1_6)
-def has_python_unit_test(step):
- return step.build.getProperty('branch') != 'rel_1_6'
-
osrf_factory.addStep(python_twisted.Trial(
- doStepIf=has_python_unit_test,
testpath="build",
tests="src/python/tests/json_test.py"))
@@ -225,9 +214,7 @@ class PerlModuleTestMFHDMadness(shell.PerlModuleTest):
def has_perl_unit_tests(step):
'Only run Perl tests if there are tests'
- if (step.build.getProperty('branch') == 'rel_1_6_1'):
- return False
- elif (step.build.getProperty('branch') == 'rel_2_0'):
+ if (step.build.getProperty('branch') == 'rel_2_0'):
return False
return True
-----------------------------------------------------------------------
Summary of changes:
examples/buildbot.cfg | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list