# HG changeset patch # User Jeff Hammel # Date 1296688134 28800 # Node ID 1a50b63c73a3674c9f113f1f6bbb425e36a13526 # Parent 854ac4008ac8c27404ceaeb0347f21ae060a10c6 template now uses the slave os diff -r 854ac4008ac8 -r 1a50b63c73a3 autobot/template.py --- a/autobot/template.py Wed Feb 02 14:52:09 2011 -0800 +++ b/autobot/template.py Wed Feb 02 15:08:54 2011 -0800 @@ -20,6 +20,16 @@ except ImportError: from subprocess import call +# default OS type +# XXX this should use MozInfo when that's ready +os_type=None +if sys.platform.startswith('linux'): + os_type = 'linux' +elif sys.platform.startswith('darwin'): + os_type = 'mac' +elif sys.platform.startswith('win'): + os_type = 'win' + def print_descriptions(): """print factory descriptions""" @@ -37,6 +47,7 @@ description = 'template for the autotools buildbot master' templates = [os.path.join('template', 'master')] vars = [Variable('slave', 'buildslave name', '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), Variable('htmlport', 'port for waterfall display', default=8010, cast=int)] diff -r 854ac4008ac8 -r 1a50b63c73a3 autobot/template/master/master.ini --- a/autobot/template/master/master.ini Wed Feb 02 14:52:09 2011 -0800 +++ b/autobot/template/master/master.ini Wed Feb 02 15:08:54 2011 -0800 @@ -6,4 +6,5 @@ pollInterval = 30 treeStableTimer = 30 -[slave:{{slave}}] \ No newline at end of file +[slave:{{slave}}] +os = {{os}}