[Checkins] SVN: Sandbox/janjaapdriessen/buildbot/buildout.cfg refactoring of build slaves.
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Fri Apr 16 15:50:22 EDT 2010
Log message for revision 111002:
refactoring of build slaves.
Changed:
U Sandbox/janjaapdriessen/buildbot/buildout.cfg
-=-
Modified: Sandbox/janjaapdriessen/buildbot/buildout.cfg
===================================================================
--- Sandbox/janjaapdriessen/buildbot/buildout.cfg 2010-04-16 19:47:53 UTC (rev 111001)
+++ Sandbox/janjaapdriessen/buildbot/buildout.cfg 2010-04-16 19:50:22 UTC (rev 111002)
@@ -2,17 +2,8 @@
parts = master
${slaves:result-sections}
${projects:result-sections}
- ${projects-win:result-sections}
poller
-
-# ztk
-# ztk-win-projects
-# ztk-win-py2.5
-# ztk-win-py2.6
# grok-trunk
-# grok-trunk-win-projects
-# grok-trunk-win-py2.5
-# grok-trunk-win-py2.6
# grok-1.0
# grok-1.0-win-projects
# grok-1.0-win-py2.5
@@ -71,6 +62,8 @@
slave-ubuntu32-py2.6
slave-ubuntu64-py2.5:slave-python2.5
slave-ubuntu64-py2.6
+ slave-win-py2.5:slave-python2.5
+ slave-win-py2.6
[slave-macro]
host = ${config:host}
@@ -103,44 +96,47 @@
test-sequence = $${:test}
periodic-scheduler = 1440
# sensible defaults
-bootstrap = python ${buildout:directory}/bootstrap.py
test = bin/test
buildout = bin/buildout -vvv
+# XXX only works if the slave is on the same system
+bootstrap = python ${buildout:directory}/bootstrap.py
slaves = slave-ubuntu32-py2.5
slave-ubuntu32-py2.6
slave-ubuntu64-py2.5
slave-ubuntu64-py2.6
-[projects]
-recipe = zc.recipe.macro
-result-recipe = collective.buildbot:project
-macro = project-macro
-targets = grokdependencies-trunk:grokdependencies-trunk-parameters
-# ztk:ztk-parameters
-# grok-trunk:grok-trunk-parameters
-# groktoolkit:groktoolkit-parameters
-# grok-1.0:grok-1.0-parameters
-# zope2-trunk:zope2-trunk-parameters
+[project-win-2.5-defaults]
+slaves = slave-win-py2.5
+bootstrap = C:\projects\virtualenv-2.5\Scripts\python C:\projects\bootstrap.py
+buildout = bin\buildout
+test = bin\test
+[project-win-2.6-defaults]
+slaves = slave-win-py2.6
+bootstrap = C:\projects\virtualenv-2.6\Scripts\python C:\projects\bootstrap.py
+buildout = bin\buildout
+test = bin\test
-[projects-win]
+
+[projects]
recipe = zc.recipe.macro
result-recipe = collective.buildbot:project
macro = project-macro
-slaves = slave-win-py2.5:slave-python2.5
- slave-win-py2.6
-bootstrap = python C:\Projects\bootstrap.py
-targets = grokdependencies-trunk:grokdependencies-trunk-parameters
-# ztk:ztk-parameters
+targets = grokdependencies:grokdependencies-parameters
+ grokdependencies-win-2.5:grokdependencies-parameters-win-2.5
+ grokdependencies-win-2.6:grokdependencies-parameters-win-2.6
+ ztk:ztk-parameters
+ ztk-win-2.5:ztk-parameters-win-2.5
+ ztk-win-2.6:ztk-parameters-win-2.6
+ groktoolkit:groktoolkit-parameters
+ groktoolkit-win-2.6:groktoolkit-parameters-win-2.6
# grok-trunk:grok-trunk-parameters
-# groktoolkit:groktoolkit-parameters
# grok-1.0:grok-1.0-parameters
# zope2-trunk:zope2-trunk-parameters
-
-[grokdependencies-trunk-parameters]
+[grokdependencies-parameters]
repos =
http://svn.zope.org/repos/main/grokcore.annotation/trunk
http://svn.zope.org/repos/main/grokcore.component/trunk
@@ -159,19 +155,46 @@
#http://svn.zope.org/repos/main/grokproject/trunk
http://svn.zope.org/repos/main/grokui.introspector/trunk
+[grokdependencies-parameters-win-2.5]
+<= project-win-2.5-defaults
+repos = ${grokdependencies-parameters:repos}
-[groktoolkit-parameters]
-repos =
- http://svn.zope.org/repos/main/groktoolkit/trunk
-test = bin/test-grok
+[grokdependencies-parameters-win-2.6]
+<= project-win-2.6-defaults
+repos = ${grokdependencies-parameters:repos}
+
+
[ztk-parameters]
-repos =
- http://svn.zope.org/repos/main/zopetoolkit/trunk
+repos = http://svn.zope.org/repos/main/zopetoolkit/trunk
test = bin/test-ztk
+[ztk-parameters-win-2.5]
+<= project-win-2.5-defaults
+repos = ${ztk-parameters:repos}
+test = bin\test-ztk
+
+
+[ztk-parameters-win-2.6]
+<= project-win-2.6-defaults
+repos = ${ztk-parameters:repos}
+test = bin\test-ztk
+
+
+[groktoolkit-parameters]
+repos = http://svn.zope.org/repos/main/groktoolkit/trunk
+test = bin/test-grok
+
+[groktoolkit-parameters-win-2.6]
+<= project-win-2.6-defaults
+repos = ${groktoolkit-parameters:repos}
+test = bin\test-grok
+
+
+
+
[zope2-trunk-parameters]
repos =
http://svn.zope.org/repos/main/Zope/trunk
More information about the checkins
mailing list