[Checkins] SVN: Sandbox/janjaapdriessen/buildbot/buildout.cfg only one buildslave per platform
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Wed Apr 21 03:29:42 EDT 2010
Log message for revision 111195:
only one buildslave per platform
Changed:
U Sandbox/janjaapdriessen/buildbot/buildout.cfg
-=-
Modified: Sandbox/janjaapdriessen/buildbot/buildout.cfg
===================================================================
--- Sandbox/janjaapdriessen/buildbot/buildout.cfg 2010-04-21 00:35:54 UTC (rev 111194)
+++ Sandbox/janjaapdriessen/buildbot/buildout.cfg 2010-04-21 07:29:41 UTC (rev 111195)
@@ -2,13 +2,8 @@
parts = master
${projects:result-sections}
poller
-# grok-trunk
-# grok-1.0
-# grok-1.0-win-projects
-# grok-1.0-win-py2.5
-# groktoolkit
-# zope2-trunk
-# grokdependencies-trunk
+ slaves
+ reboot-slaves
versions = versions
extensions = buildout.dumppickedversions
allow-picked-versions = false
@@ -24,6 +19,7 @@
manuel = 1.0.5
buildout.dumppickedversions = 0.4
virtualenv = 1.4.6
+z3c.recipe.usercrontab = 1.0
zc.buildout = 1.4.3
zc.recipe.egg = 1.2.2
zc.recipe.macro = 1.3.0
@@ -32,49 +28,37 @@
zope.interface = 3.5.3
zope.testing = 3.9.4
-
[config]
host = localhost
-
[master]
recipe = collective.buildbot:master
project-name = Zope Buildbot
max-builds = 1
allow-force = true
slaves =
- slave-osx-py2.5 secret
- slave-osx-py2.6 secret
- slave-ubuntu32-py2.5 secret
- slave-ubuntu32-py2.6 secret
- slave-ubuntu64-py2.5 secret
- slave-ubuntu64-py2.6 secret
+ slave-ubuntu32 secret
+ slave-ubuntu64 secret
+ slave-osx secret
slave-win-py2.5 secret
slave-win-py2.6 secret
-
[slaves]
recipe = zc.recipe.macro
result-recipe = collective.buildbot:slave
macro = slave-macro
-targets = slave-ubuntu32-py2.5:slave-python2.5
- slave-ubuntu32-py2.6
- slave-ubuntu64-py2.5:slave-python2.5
- slave-ubuntu64-py2.6
- slave-win-py2.5:slave-python2.5
+targets = slave-ubuntu32
+ slave-ubuntu64
+ slave-osx
+ slave-win-py2.5
slave-win-py2.6
[slave-macro]
host = ${config:host}
port = 8999
password = secret
-executable = $${:python}
-python = python2.6
-[slave-python2.5]
-python = python2.5
-
[poller]
recipe = collective.buildbot:poller
repositories = http://svn.zope.org/repos/main
@@ -96,44 +80,43 @@
periodic-scheduler = 1440
# sensible defaults
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
+buildout = bin/buildout -v
+# Working around the virtualenv of collective.buildbot in order to have one
+# buildslave per platform. We 'just know' the location of the python
+# interpreter.
+bootstrap = /usr/bin/python2.6 bootstrap.py
+slaves = slave-ubuntu32
+ slave-ubuntu64
+ slave-osx
+[project-py2.5-defaults]
+bootstrap = /usr/bin/python2.5 bootstrap.py
-[project-win-2.5-defaults]
+[project-win-py2.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]
+[project-win-py2.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
-[project-2.6-defaults]
-slaves = slave-ubuntu32-py2.6
- slave-ubuntu64-py2.6
-
[projects]
recipe = zc.recipe.macro
result-recipe = collective.buildbot:project
macro = project-macro
targets = grokdependencies:grokdependencies-parameters
- grokdependencies-win-2.6:grokdependencies-parameters-win-2.6
+ grokdependencies-py2.5:grokdependencies-parameters-py2.5
+ grokdependencies-win-py2.6:grokdependencies-parameters-win-py2.6
ztk:ztk-parameters
- ztk-win-2.6:ztk-parameters-win-2.6
+ ztk-win-py2.6:ztk-parameters-win-py2.6
groktoolkit:groktoolkit-parameters
- groktoolkit-win-2.6:groktoolkit-parameters-win-2.6
+ groktoolkit-win-py2.6:groktoolkit-parameters-win-py2.6
# grok-trunk:grok-trunk-parameters
# grok-1.0:grok-1.0-parameters
-# zope2-trunk:zope2-trunk-parameters
[grokdependencies-parameters]
@@ -155,129 +138,115 @@
http://svn.zope.org/repos/main/grokproject/trunk
http://svn.zope.org/repos/main/grokui.introspector/trunk
-[grokdependencies-parameters-win-2.6]
-<= project-win-2.6-defaults
+[grokdependencies-parameters-py2.5]
+<= project-py2.5-defaults
repos = ${grokdependencies-parameters:repos}
+[grokdependencies-parameters-win-py2.6]
+<= project-win-py2.6-defaults
+repos = ${grokdependencies-parameters:repos}
[ztk-parameters]
-<= project-2.6-defaults
repos = http://svn.zope.org/repos/main/zopetoolkit/trunk
test = bin/test-ztk
-[ztk-parameters-win-2.6]
-<= project-win-2.6-defaults
+[ztk-parameters-win-py2.6]
+<= project-win-py2.6-defaults
repos = ${ztk-parameters:repos}
test = bin\test-ztk
[groktoolkit-parameters]
-<= project-2.6-defaults
repos = http://svn.zope.org/repos/main/groktoolkit/trunk
test = bin/test-grok
-[groktoolkit-parameters-win-2.6]
-<= project-win-2.6-defaults
+[groktoolkit-parameters-win-py2.6]
+<= project-win-py2.6-defaults
repos = ${groktoolkit-parameters:repos}
test = bin\test-grok
-[zope2-trunk-parameters]
-repos =
- http://svn.zope.org/repos/main/Zope/trunk
-bootstrap = python bootstrap.py
-test = bin/alltests
+#[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
-[ztk-win-macro]
-<= project-macro
-repos =
- ${ztk-parameters:repos}
-slave-names = slave-win-py2.$${:version_minor}
-bootstrap = $${:python-path} $${:bootstrap-path}
-test = bin\test-ztk
+[reboot-slave-macro]
+times = @reboot
+command = ${buildout:bin-directory}/slave-$${:__name__} start
-
-[ztk-win-projects]
+[reboot-slaves]
recipe = zc.recipe.macro
-result-recipe = collective.buildbot:project
-macro = ztk-win-macro
-targets = ztk-win-py2.5:slave-win-py2.5
- ztk-win-py2.6:slave-win-py2.6
+result-recipe = z3c.recipe.usercrontab
+macro = reboot-slave-macro
+targets = ubuntu32
+ ubuntu64
+ osx
+
+[reboot-master]
+recipe = z3c.recipe.usercrontab
+times = @reboot
+command = ${buildout:bin-directory}/master start
-
-[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
-
-
-
-[python2.5]
-version_minor = 5
-
-
-[python2.6]
-version_minor = 6
-
More information about the checkins
mailing list