[Checkins] SVN: Sandbox/janjaapdriessen/buildbot/buildout.cfg Test more packages on py2.7, less on py2.5

[Jan-Jaap Driessen]

Log message for revision 122258:
  Test more packages on py2.7, less on py2.5

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

-=-
Modified: Sandbox/janjaapdriessen/buildbot/buildout.cfg
===================================================================
--- Sandbox/janjaapdriessen/buildbot/buildout.cfg	2011-07-15 08:36:23 UTC (rev 122257)
+++ Sandbox/janjaapdriessen/buildbot/buildout.cfg	2011-07-15 08:43:13 UTC (rev 122258)
@@ -169,7 +169,7 @@
 recipe = zc.recipe.macro
 result-recipe = collective.buildbot:project
 macro = project-macro-py2.5
-targets = trunks-py2.5:trunk_repos_plus_crontab_grokproject_C_extentions_proxy
+targets = trunks-py2.5:trunk_repos-py2.5_plus_crontab_grokproject_C_extentions
           zopetoolkit-1.0-py2.5:zopetoolkit-1.0_parameters
           zopetoolkit-1.1-py2.5:zopetoolkit-1.1_parameters
           zopetoolkit-py2.5:zopetoolkit_parameters
@@ -179,7 +179,7 @@
 recipe = zc.recipe.macro
 result-recipe = collective.buildbot:project
 macro = project-macro-win-py2.5
-targets = trunks-win-py2.5:trunk_repos
+targets = trunks-win-py2.5:trunk_repos-py2.5
           zopetoolkit-1.0_win-py2.5:zopetoolkit-1.0_parameters-win
           zopetoolkit-1.1_win-py2.5:zopetoolkit-1.1_parameters-win
           zopetoolkit_win-py2.5:zopetoolkit_parameters-win
@@ -189,7 +189,7 @@
 recipe = zc.recipe.macro
 result-recipe = collective.buildbot:project
 macro = project-macro-py2.6
-targets = trunks-py2.6:trunk_repos_plus_crontab_grokproject_C_extentions_proxy
+targets = trunks-py2.6:trunk_repos_plus_crontab_grokproject_C_extentions
           zopetoolkit-1.0-py2.6:zopetoolkit-1.0_parameters
           zopetoolkit-1.1-py2.6:zopetoolkit-1.1_parameters
           zopetoolkit-py2.6:zopetoolkit_parameters
@@ -249,7 +249,7 @@
           groktoolkit_win-py2.7:groktoolkit_parameters-win
           zope2.13_win-py2.7:zope2.13_parameters-win
 
-[trunk_repos]
+[trunk_repos-py2.5]
 repos =
 # Grok Toolkit packages.
     http://svn.zope.org/repos/main/grokcore.annotation/trunk
@@ -267,7 +267,6 @@
     http://svn.zope.org/repos/main/grokcore.viewlet/trunk
     http://svn.zope.org/repos/main/grokcore.view/trunk
     http://svn.zope.org/repos/main/grokcore.xmlrpc/trunk
-    http://svn.zope.org/repos/main/grok/trunk
     http://svn.zope.org/repos/main/grokui.admin/trunk
     http://svn.zope.org/repos/main/grokui.base/trunk
     http://svn.zope.org/repos/main/martian/branches/0.11
@@ -348,7 +347,23 @@
 # z3c packages
     http://svn.zope.org/repos/main/z3c.schema/trunk
 
+[trunk_repos]
+repos = ${trunk_repos-py2.5:repos}
+    http://svn.zope.org/repos/main/grok/trunk
 
+# trunk_repos-2.5 + crontab, grokproject and projects with C-extensions.
+[trunk_repos-py2.5_plus_crontab_grokproject_C_extentions]
+repos = ${trunk_repos-py2.5:repos}
+        http://svn.zope.org/repos/main/z3c.recipe.usercrontab/trunk
+        http://svn.zope.org/repos/main/zope.hookable/trunk
+        http://svn.zope.org/repos/main/zope.i18nmessageid/trunk
+        http://svn.zope.org/repos/main/zope.index/trunk
+        http://svn.zope.org/repos/main/zope.interface/trunk
+        http://svn.zope.org/repos/main/grokproject/trunk
+        http://svn.zope.org/repos/main/zope.security/trunk
+        http://svn.zope.org/repos/main/zope.container/trunk
+        http://svn.zope.org/repos/main/zope.proxy/trunk
+
 # trunk_repos + crontab, grokproject and projects with C-extensions.
 [trunk_repos_plus_crontab_grokproject_C_extentions]
 repos = ${trunk_repos:repos}
@@ -358,10 +373,6 @@
         http://svn.zope.org/repos/main/zope.index/trunk
         http://svn.zope.org/repos/main/zope.interface/trunk
         http://svn.zope.org/repos/main/grokproject/trunk
-
-# Do not test zope.proxy with python 2.7
-[trunk_repos_plus_crontab_grokproject_C_extentions_proxy]
-repos = ${trunk_repos_plus_crontab_grokproject_C_extentions:repos}
         http://svn.zope.org/repos/main/zope.security/trunk
         http://svn.zope.org/repos/main/zope.container/trunk
         http://svn.zope.org/repos/main/zope.proxy/trunk