Build scripts refactor to support multislave

slave/run_slave.py

 #!/usr/bin/env python
 # 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.
 
 """ Initialize the environment variables and start the buildbot slave.
 """
 
 import os
 import shutil
-import socket
 import subprocess
 import sys
 import time
 
 SCRIPT_PATH = os.path.dirname(os.path.abspath(__file__))
 needs_reboot = False
 
+# Temporarily add scripts to the path.  We do so in a more consistent
+# manner below, but cannot keep it here because of our recursive calls.
+sys.path.insert(0, os.path.join(os.path.dirname(SCRIPT_PATH), 'scripts'))
+from common import chromium_utils
+sys.path.pop(0)
+
 # By default, the slave will identify itself to the master by its hostname.
 # To override that, explicitly set a slavename here.
 slavename = None
 
 def remove_all_vars_except(dictionary, keep):
   """Remove all keys from the specified dictionary except those in !keep|"""
   for key in set(dictionary.keys()) - set(keep):
     dictionary.pop(key)
 
 
@@ skipping 134 matching lines @@
 
   Bot.old_remote_setBuilderList = Bot.remote_setBuilderList
   def cleanup(self, wanted):
     retval = self.old_remote_setBuilderList(wanted)
     wanted_dirs = sorted(['info', 'cert', '.svn'] + [r[1] for r in wanted])
     Log('Wanted directories: %s' % wanted_dirs)
     actual_dirs = sorted(
         i for i in os.listdir(self.basedir)
         if os.path.isdir(os.path.join(self.basedir, i)))
     Log('Actual directories: %s' % actual_dirs)
-    from common import chromium_utils
     for d in actual_dirs:
       # Delete build.dead directories.
       possible_build_dead = os.path.join(self.basedir, d, 'build.dead')
       if os.path.isdir(possible_build_dead):
         Log('Deleting unwanted directory %s' % possible_build_dead)
         if not is_testing:
           chromium_utils.RemoveDirectory(possible_build_dead)
 
       # Delete old slave directories.
       if d not in wanted_dirs:
         Log('Deleting unwanted directory %s' % d)
         if not is_testing:
           chromium_utils.RemoveDirectory(os.path.join(self.basedir, d))
     return retval
   Bot.new_remote_setBuilderList = cleanup
   Bot.remote_setBuilderList = Bot.new_remote_setBuilderList
 
 
 def FixSubversionConfig():
   if sys.platform == 'win32':
     dest = os.path.join(os.environ['APPDATA'], 'Subversion', 'config')
   else:
     dest = os.path.join(os.environ['HOME'], '.subversion', 'config')
   shutil.copyfile('config', dest)
 
 
-def GetActiveSlavename(config_bootstrap):
-  active_slavename = os.environ.get('TESTING_SLAVENAME', slavename)
-  if active_slavename:
-    config_bootstrap.Master.active_slavename = active_slavename
-  else:
-    config_bootstrap.Master.active_slavename = (
-        socket.getfqdn().split('.', 1)[0].lower())
-  return active_slavename
-
-
 def GetActiveMaster(slave_bootstrap, config_bootstrap, active_slavename):
   master_name = os.environ.get(
-      'TESTING_MASTER', slave_bootstrap.GetActiveMaster(active_slavename))
+      'TESTING_MASTER', chromium_utils.GetActiveMaster(active_slavename))
   if not master_name:
     raise RuntimeError('*** Failed to detect the active master')
   slave_bootstrap.ImportMasterConfigs(master_name)
   if hasattr(config_bootstrap.Master, 'active_master'):
     # pylint: disable=E1101
     return config_bootstrap.Master.active_master
   if master_name and getattr(config_bootstrap.Master, master_name):
     master = getattr(config_bootstrap.Master, master_name)
     config_bootstrap.Master.active_master = master
     return master
@@ skipping 50 matching lines @@
     os.path.join(build_dir, 'third_party'),
     os.path.join(root_dir, 'build_internal', 'site_config'),
     os.path.join(root_dir, 'build_internal', 'symsrc'),
     SCRIPT_PATH,  # Include the current working directory by default.
   ]
 
   # Need to update sys.path prior to the following imports.
   sys.path = python_path + sys.path
   import slave.bootstrap
   import config_bootstrap
-  active_slavename = GetActiveSlavename(config_bootstrap)
-  active_master = GetActiveMaster(slave.bootstrap, config_bootstrap,
-                                  active_slavename)
+  active_slavename = chromium_utils.GetActiveSlavename()
+  config_bootstrap.Master.active_slavename = active_slavename
+  active_master = GetActiveMaster(
+      slave.bootstrap, config_bootstrap, active_slavename)
 
   bb_ver, tw_ver = GetThirdPartyVersions(active_master)
   python_path.append(os.path.join(build_dir, 'third_party', bb_ver))
   python_path.append(os.path.join(build_dir, 'third_party', tw_ver))
   sys.path.extend(python_path[-2:])
 
   os.environ['PYTHONPATH'] = (
       os.pathsep.join(python_path) + os.pathsep + os.environ['PYTHONPATH'])
 
   os.environ['CHROME_HEADLESS'] = '1'
@@ skipping 126 matching lines @@
     msg = '(%s) `gclient sync` failed; proceeding anyway...' % sys.argv[0]
     print >> sys.stderr, msg
   os.environ['RUN_SLAVE_UPDATED_SCRIPTS'] = '1'
   return True
 
 
 if '__main__' == __name__:
   if UpdateScripts():
     os.execv(sys.executable, [sys.executable] + sys.argv)
   main()