[Checkins] SVN: Sandbox/janjaapdriessen/buildbot/buildout.cfg add py2.5 and py2.7

[Jan-Jaap Driessen]

Log message for revision 117307:
  add py2.5 and py2.7

Changed:
  U   Sandbox/janjaapdriessen/buildbot/buildout.cfg

-=-
Modified: Sandbox/janjaapdriessen/buildbot/buildout.cfg
===================================================================
--- Sandbox/janjaapdriessen/buildbot/buildout.cfg	2010-10-06 15:02:53 UTC (rev 117306)
+++ Sandbox/janjaapdriessen/buildbot/buildout.cfg	2010-10-06 15:12:11 UTC (rev 117307)
@@ -1,6 +1,11 @@
 [buildout]
 parts = master
-        ${projects:result-sections}
+        ${py2.5:result-sections}
+        ${win-py2.5:result-sections}
+        ${py2.6:result-sections}
+        ${win-py2.6:result-sections}
+        ${py2.7:result-sections}
+        ${win-py2.7:result-sections}
         poller
         slaves
         reboot-slaves
@@ -65,7 +70,6 @@
 repositories = http://svn.zope.org/repos/main
 poll-interval = 3600
 
-
 [project-macro]
 slave-names = $${:slaves}
 vcs = svn
@@ -85,41 +89,98 @@
 buildout = bin/buildout -v
 mailmode = failing
 mailto = root at localhost
-# If the buildslave is built with python2.6
-# collective.buildbot will inject a python2.6 virtualenv here.
-bootstrap = python2.6 bootstrap.py --distribute
+bootstrap = python bootstrap.py --distribute
 slaves = slave-ubuntu32
          slave-ubuntu64
          slave-osx
 
-[project-py2.5-defaults]
+[project-macro-py2.5]
+<= project-macro
 bootstrap = python2.5 bootstrap.py --distribute
 
-[project-win-py2.5-defaults]
+[project-macro-py2.6]
+<= project-macro
+bootstrap = python2.6 bootstrap.py --distribute
+
+[project-macro-py2.7]
+<= project-macro
+bootstrap = python2.7 bootstrap.py --distribute
+
+[project-macro-win-py2.5]
+<= project-macro
 slaves = slave-win
 bootstrap = C:\projects\virtualenv-2.5\Scripts\python bootstrap.py
 buildout = bin\buildout -v
 test = bin\test
 
-[project-win-py2.6-defaults]
+[project-macro-win-py2.6]
+<= project-macro
 slaves = slave-win
 bootstrap = C:\projects\virtualenv-2.6\Scripts\python bootstrap.py
 buildout = bin\buildout -v
 test = bin\test
 
-[projects]
+[project-macro-win-py2.7]
+<= project-macro
+slaves = slave-win
+bootstrap = C:\projects\virtualenv-2.7\Scripts\python bootstrap.py
+buildout = bin\buildout -v
+test = bin\test
+
+[py2.5]
 recipe = zc.recipe.macro
 result-recipe = collective.buildbot:project
-macro = project-macro
-targets = trunks:trunks_parameters
-          trunks-win:trunks_parameters-win
-          ztk:ztk_parameters
-          ztk_win:ztk_parameters-win
-          groktoolkit:groktoolkit_parameters
-          groktoolkit_win:groktoolkit_parameters-win
-          zope2:zope2_parameters
-          zope2.12:zope2.12_parameters
+macro = project-macro-py2.5
+targets = trunks-py2.5:trunks_parameters
+          ztk-py2.5:ztk_parameters
+          groktoolkit-py2.5:groktoolkit_parameters
+          zope2-py2.5:zope2_parameters
+          zope2.12-py2.5:zope2.12_parameters
 
+[win-py2.5]
+recipe = zc.recipe.macro
+result-recipe = collective.buildbot:project
+macro = project-macro-win-py2.5
+targets = trunks-win-py2.5:trunks_parameters-win
+          ztk_win-py2.5:ztk_parameters-win
+          groktoolkit_win-py2.5:groktoolkit_parameters-win
+
+[py2.6]
+recipe = zc.recipe.macro
+result-recipe = collective.buildbot:project
+macro = project-macro-py2.6
+targets = trunks-py2.6:trunks_parameters
+          ztk-py2.6:ztk_parameters
+          groktoolkit-py2.6:groktoolkit_parameters
+          zope2-py2.6:zope2_parameters
+          zope2.12-py2.6:zope2.12_parameters
+
+[win-py2.6]
+recipe = zc.recipe.macro
+result-recipe = collective.buildbot:project
+macro = project-macro-win-py2.6
+targets = trunks-win-py2.6:trunks_parameters-win
+          ztk_win-py2.6:ztk_parameters-win
+          groktoolkit_win-py2.6:groktoolkit_parameters-win
+
+[py2.7]
+recipe = zc.recipe.macro
+result-recipe = collective.buildbot:project
+macro = project-macro-py2.7
+targets = trunks-py2.7:trunks_parameters
+          ztk-py2.7:ztk_parameters
+          groktoolkit-py2.7:groktoolkit_parameters
+          zope2-py2.7:zope2_parameters
+          zope2.12-py2.7:zope2.12_parameters
+
+[win-py2.7]
+recipe = zc.recipe.macro
+result-recipe = collective.buildbot:project
+macro = project-macro-win-py2.7
+targets = trunks-win-py2.7:trunks_parameters-win
+          ztk_win-py2.7:ztk_parameters-win
+          groktoolkit_win-py2.7:groktoolkit_parameters-win
+
 [trunk_repos]
 repos =
     http://svn.zope.org/repos/main/grokcore.annotation/trunk
@@ -220,7 +281,6 @@
         http://svn.zope.org/repos/main/zope.security/trunk
 
 [trunks_parameters-win]
-<= project-win-py2.6-defaults
 repos = ${trunk_repos:repos}
 
 [ztk_parameters]
@@ -233,7 +293,6 @@
 mailmode = all
 
 [ztk_parameters-win]
-<= project-win-py2.6-defaults
 repos = ${ztk_parameters:repos}
 test = bin\test-ztk
        bin\test-zopeapp
@@ -246,7 +305,6 @@
 test = bin/test-grok
 
 [groktoolkit_parameters-win]
-<= project-win-py2.6-defaults
 repos = ${groktoolkit_parameters:repos}
 test = bin\test-grok
 
@@ -257,7 +315,6 @@
 mailmode = all
 
 [zope2_parameters-win]
-<= project-win-py2.6-defaults
 repos = http://svn.zope.org/repos/main/Zope/trunk
 test = bin\alltests
 mailto = zope-tests at zope.org
@@ -270,7 +327,6 @@
 mailmode = all
 
 [zope2.12_parameters-win]
-<= project-win-py2.6-defaults
 repos = http://svn.zope.org/repos/main/Zope/branches/2.12
 test = bin\alltests
 mailto = zope-tests at zope.org