Mercurial > hg > autobot

changeset 207:dc56c0de73bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
name the slave to the os by default
author Jeff Hammel <jhammel@mozilla.com>
date Fri, 04 Feb 2011 08:30:53 -0800
parents 3e5d1c1e302d
children 2d5b78d3411c
files autobot/template.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/autobot/template.py	Fri Feb 04 08:28:21 2011 -0800
+++ b/autobot/template.py	Fri Feb 04 08:30:53 2011 -0800
@@ -46,7 +46,7 @@
     name = 'autobot-master'
     description = 'template for the autotools buildbot master'
     templates = [os.path.join('template', 'master')]
-    vars = [Variable('slave', 'buildslave name', 'slave'),
+    vars = [Variable('slave', 'buildslave name', os_type or 'slave'),
             Variable('os', 'buildslave os (win, mac, linux)', os_type),
             Variable('passwd', 'buildslave password', default='passwd'),
             Variable('slaveport', 'port to talk to slaves on', default=9010, cast=int),
@@ -85,7 +85,7 @@
     description = 'template for the autotools buildbot slave'
     templates = [os.path.join('template', 'slave')]
     vars = [Variable('master', 'host of the master', default='localhost'),
-            Variable('slave', 'buildslave name', 'slave'),
+            Variable('slave', 'buildslave name', os_type or 'slave'),
             Variable('passwd', 'buildslave password', default='passwd'),
             Variable('slaveport', 'port to talk to slaves on', default=9010)]