[Checkins] SVN: Sandbox/janjaapdriessen/buildbot/buildout.cfg Clean up project / platform / python version combinations in project definitions. Send the results of the groktoolkit compattest to zope-tests at zope.org.

Jan-Jaap Driessen jdriessen at thehealthagency.com
Wed May 5 17:46:35 EDT 2010


Log message for revision 112064:
  Clean up project / platform / python version combinations in project definitions. Send the results of the groktoolkit compattest to zope-tests at zope.org.

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

-=-
Modified: Sandbox/janjaapdriessen/buildbot/buildout.cfg
===================================================================
--- Sandbox/janjaapdriessen/buildbot/buildout.cfg	2010-05-05 19:57:20 UTC (rev 112063)
+++ Sandbox/janjaapdriessen/buildbot/buildout.cfg	2010-05-05 21:46:35 UTC (rev 112064)
@@ -70,7 +70,7 @@
 repositories = $${:repos}
 mail-host = localhost
 email-notification-sender = no-reply at localhost
-email-notification-recipients = root at localhost
+email-notification-recipients = ${{:mailto}
 build-sequence = 
     $${:bootstrap}
     $${:buildout}
@@ -79,6 +79,7 @@
 # sensible defaults
 test = bin/test
 buildout = bin/buildout -v
+mailto = root at localhost
 # Working around the virtualenv of collective.buildbot in order to have one 
 # buildslave per platform. We 'just know' the location of the python 
 # interpreter.
@@ -106,19 +107,21 @@
 recipe = zc.recipe.macro
 result-recipe = collective.buildbot:project
 macro = project-macro
-targets = grokdependencies:grokdependencies-parameters
-          grokdependencies-py2.5:grokdependencies-parameters-py2.5
-          grokdependencies-win-py2.6:grokdependencies-parameters-win-py2.6
-          ztk:ztk-parameters
-          ztk-win-py2.6:ztk-parameters-win-py2.6
-          groktoolkit:groktoolkit-parameters
-          groktoolkit-win-py2.6:groktoolkit-parameters-win-py2.6
-#          grok-trunk:grok-trunk-parameters
-#          grok-1.0:grok-1.0-parameters
+targets = bin-test_py2.5:bin-test_parameters-py2.5
+          bin-test_py2.6:bin-test_parameters-py2.6
+          bin-test_win-py2.5:bin-test_parameters-win-py2.5
+          bin-test_win-py2.6:bin-test_parameters-win-py2.6
+          bin-test-ztk-py2.5:bin-test-ztk_parameters-py2.5
+          bin-test-ztk-py2.6:bin-test-ztk_parameters-py2.6
+          bin-test-ztk_win-py2.5:bin-test-ztk_parameters-win-py2.5
+          bin-test-ztk_win-py2.6:bin-test-ztk_parameters-win-py2.6
+          bin-test-grok:bin-test-grok_parameters
+          bin-test-grok_win-py2.6:bin-test-grok_parameters-win-py2.6
 
 
-[grokdependencies-parameters]
+[bin-test_parameters]
 repos = 
+    http://svn.zope.org/repos/main/grok/trunk
     http://svn.zope.org/repos/main/grokcore.annotation/trunk
     http://svn.zope.org/repos/main/grokcore.component/trunk
     http://svn.zope.org/repos/main/grokcore.component/branches/1.x
@@ -135,102 +138,59 @@
     http://svn.zope.org/repos/main/martian/branches/0.11
     http://svn.zope.org/repos/main/grokproject/trunk
     http://svn.zope.org/repos/main/grokui.introspector/trunk
+    http://svn.zope.org/repos/main/megrok.strictrequire/trunk
 
-[grokdependencies-parameters-py2.5]
+# Test grok 1.0 branch on 2.5 only.
+[bin-test_parameters-py2.5]
 <= project-py2.5-defaults
-repos = ${grokdependencies-parameters:repos}
+repos = http://svn.zope.org/repos/main/grok/branches/1.0
 
-[grokdependencies-parameters-win-py2.6]
+[bin-test_parameters-win-py2.5]
+<= project-win-py2.5-defaults
+repos = ${bin-test_parameters-py2.5:repos}
+
+# Don't test usercrontab on windows.
+[bin-test_parameters-py2.6]
+repos = ${bin-test_parameters:repos}
+        http://svn.zope.org/repos/main/z3c.recipe.usercrontab/trunk
+
+[bin-test_parameters-win-py2.6]
 <= project-win-py2.6-defaults
-repos = ${grokdependencies-parameters:repos}
+repos = ${bin-test_parameters:repos}
 
 
-[ztk-parameters]
+[bin-test-ztk_parameters-py2.5]
+<= project-py2.5-defaults
+repos = ${bin-test-ztk_parameters-py2.6:repos}
+test = ${bin-test-ztk_parameters-py2.6:test}
+
+[bin-test-ztk_parameters-py2.6]
 repos = http://svn.zope.org/repos/main/zopetoolkit/trunk
 test = bin/test-ztk
 
-[ztk-parameters-win-py2.6]
+[bin-test-ztk_parameters-win-py2.5]
+<= project-win-py2.5-defaults
+repos = ${bin-test-ztk_parameters-win-py2.6:repos}
+test = ${bin-test-ztk_parameters-win-py2.6:test}
+
+[bin-test-ztk_parameters-win-py2.6]
 <= project-win-py2.6-defaults
-repos = ${ztk-parameters:repos}
+repos = ${bin-test-ztk_parameters-py2.6:repos}
 test = bin\test-ztk
 
 
-[groktoolkit-parameters]
+[bin-test-grok_parameters]
 repos = http://svn.zope.org/repos/main/groktoolkit/trunk
 test = bin/test-grok
+mailto = zope-tests at zope.org
 
-[groktoolkit-parameters-win-py2.6]
+[bin-test-grok_parameters-win-py2.6]
 <= project-win-py2.6-defaults
-repos = ${groktoolkit-parameters:repos}
+repos = ${bin-test-grok_parameters:repos}
 test = bin\test-grok
+mailto = ${bin-test-grok_parameters:mailto}
 
 
-
-
-
-#[grok-trunk-parameters]
-#repos =
-#    http://svn.zope.org/repos/main/grok/trunk
-#test = bin/compattest
-#slaves = slave-osx-py2.5
-#         slave-osx-py2.6
-#         slave-ubuntu32-py2.5
-#         slave-ubuntu32-py2.6
-#         slave-ubuntu64-py2.5
-#         slave-ubuntu64-py2.6
-#
-#
-#[grok-trunk-win-macro]
-#repositories =
-#    ${grok-trunk-parameters:repos}
-#slave-names = slave-win-py2.$${:version_minor}
-#vcs-mode = ${project-macro:vcs-mode}
-#mail-host = ${project-macro:mail-host}
-#email-notification-sender = ${project-macro:email-notification-sender}
-#email-notification-recipients = ${project-macro:email-notification-recipients}
-#build-sequence =
-#    $${:python-path} bootstrap\bootstrap.py
-#    bin\buildout -vvv
-#test = bin\compattest
-#
-#
-#[grok-trunk-win-projects]
-#recipe = zc.recipe.macro
-#result-recipe = collective.buildbot:project
-#macro = grok-trunk-win-macro
-#targets = grok-trunk-win-py2.5:slave-win-py2.5
-#          grok-trunk-win-py2.6:slave-win-py2.6
-#
-#
-#[grok-1.0-parameters]
-#repositories =
-#    http://svn.zope.org/repos/main/grok/branches/1.0
-#test = bin/test-grokcore
-#slaves = slave-osx-py2.5
-#         slave-ubuntu32-py2.5
-#         slave-ubuntu64-py2.5
-#
-#
-#[grok-1.0-win-macro]
-#repositories =
-#    ${grok-1.0-parameters:repositories}
-#slave-names = slave-win-py2.$${:version_minor}
-#vcs-mode = ${project-macro:vcs-mode}
-#mail-host = ${project-macro:mail-host}
-#email-notification-sender = ${project-macro:email-notification-sender}
-#email-notification-recipients = ${project-macro:email-notification-recipients}
-#build-sequence =
-#    $${:python-path} bootstrap\bootstrap.py
-#    bin\buildout -vvv
-#test = bin\test-grokcore
-#
-#
-#[grok-1.0-win-projects]
-#recipe = zc.recipe.macro
-#result-recipe = collective.buildbot:project
-#macro = grok-1.0-win-macro
-#targets = grok-1.0-win-py2.5:slave-win-py2.5
-
 [reboot-slave-macro]
 times = @reboot
 command = ${buildout:bin-directory}/slave-$${:__name__} start



More information about the checkins mailing list