changeset 295:773192c7c5b3

STUB: autobot/template.py
author Jeff Hammel <k0scist@gmail.com>
date Sun, 11 May 2014 04:49:45 -0700
parents 45fd58949f8a
children 3fb63aa336b3
files autobot/template.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/autobot/template.py	Sun May 11 04:30:57 2014 -0700
+++ b/autobot/template.py	Sun May 11 04:49:45 2014 -0700
@@ -35,15 +35,15 @@
     name = 'autobot-master'
     description = 'template for the autobot buildbot master'
     templates = [os.path.join('template', 'master')]
-    vars = [Variable('slave', 'buildslave name', os_type or 'slave'),
-            Variable('os', 'buildslave os (win, mac, linux)', os_type),
+    vars = [Variable('slave', 'buildslave name', 'slave'),
+            Variable('os', 'buildslave os (win, mac, linux)'),
             Variable('passwd', 'buildslave password', default='passwd'),
             Variable('slaveport', 'port to talk to slaves on', default=9010, cast=int),
             Variable('htmlport', 'port for waterfall display', default=8010, cast=int),
             Variable('publichtmlport', 'port for public waterfall display', default=8011, cast=int),
             Variable('botname', 'name of IRC bot'),
             Variable('ircHost', 'IRC host'),
-            Variable('ircChannels', 'channels for the IRC bot ("-" for none)')
+            Variable('ircChannels', 'channels for the IRC bot ("-" for none)'),
             Variable('domain', 'autobot domain name', default='localhost'),
             Variable('recipients', 'email recipients for all projects', '')
             ]
@@ -81,7 +81,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', os_type or 'slave'),
+            Variable('slave', 'buildslave name', 'slave'),
             Variable('passwd', 'buildslave password', default='passwd'),
             Variable('slaveport', 'port to talk to slaves on', default=9010)]