Build scripts refactor to support multislave

scripts/master/master_utils.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 
 import buildbot
 from buildbot import interfaces, util
 from buildbot.buildslave import BuildSlave
 from buildbot.status import mail
 from buildbot.status.builder import BuildStatus
 from buildbot.status.status_push import HttpStatusPush
 from twisted.python import log
 from zope.interface import implements
 
 from master.autoreboot_buildslave import AutoRebootBuildSlave
 from buildbot.status.web.baseweb import WebStatus
 
 if int(buildbot.version.split('.')[1]) == 7:
   from master import chromium_status_bb7 as chromium_status
 else:
   import master.chromium_status_bb8 as chromium_status
 
-from master import slaves_list
+from common import chromium_utils
 import config
 
 
 def HackMaxTime(maxTime=8*60*60):
   """Set maxTime default value to 8 hours. This function must be called before
   adding steps."""
   from buildbot.process.buildstep import RemoteShellCommand
   assert RemoteShellCommand.__init__.func_defaults == (None, 1, 1, 1200, None,
       {}, 'slave-config', True)
   RemoteShellCommand.__init__.im_func.func_defaults = (None, 1, 1, 1200,
@@ skipping 77 matching lines @@
 
   # Make sure each slave has their builder.
   builders_name = [b['name'] for b in c['builders']]
   for s in c['slaves']:
     name = s.slavename
     if not name in builders_slaves:
       raise InvalidConfig('Slave %s not associated with any builder' % name)
 
   # Make sure every defined slave is used.
   for s in slaves.GetSlaves():
-    name = slaves_list.EntryToSlaveName(s)
+    name = chromium_utils.EntryToSlaveName(s)
     if not name in slaves_name:
       raise InvalidConfig('Slave %s defined in your slaves_list is not '
                           'referenced at all' % name)
     builders = s.get('builder', [])
     if not isinstance(builders, (list, tuple)):
       builders = [builders]
     testers = s.get('testers', [])
     if not isinstance(testers, (list, tuple)):
       testers = [testers]
     builders.extend(testers)
@@ skipping 191 matching lines @@
     execfile('.manhole', values)
     if 'debugPassword' in values:
       c['debugPassword'] = values['debugPassword']
     interface = 'tcp:%s:interface=127.0.0.1' % values.get('port', 0)
     if 'port' in values and 'user' in values and 'password' in values:
       c['manhole'] = manhole.PasswordManhole(interface, values['user'],
                                             values['password'])
     elif 'port' in values:
       c['manhole'] = manhole.AuthorizedKeysManhole(interface,
           os.path.expanduser("~/.ssh/authorized_keys"))