Extract update_scripts out of annotated_run

scripts/slave/annotated_run.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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 argparse
 import collections
 import contextlib
 import json
 import logging
 import os
 import shutil
 import socket
 import subprocess
 import sys
 import tempfile
 
 
 # Install Infra build environment.
 BUILD_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
                              os.path.abspath(__file__))))
 sys.path.insert(0, os.path.join(BUILD_ROOT, 'scripts'))
 
 from common import annotator
 from common import chromium_utils
 from common import env
 from common import master_cfg_utils
 from slave import gce
 from slave import infra_platform
+from slave import update_scripts
 
 # Logging instance.
 LOGGER = logging.getLogger('annotated_run')
 
 # Return codes used by Butler/Annotee to indicate their failure (as opposed to
 # a forwarded return code from the underlying process).
 LOGDOG_ERROR_RETURNCODES = (
     # Butler runtime error.
     250,
     # Annotee runtime error.
@@ skipping 718 matching lines @@
       help='Path to the service account JSON. If one is not provided, the '
            'local system credentials will be used.')
   group.add_argument('--logdog-pubsub-topic',
       help='Override the LogDog Pub/Sub topic to write to.')
   group.add_argument('--logdog-host',
       help='Override the LogDog Coordinator host.')
 
   return parser.parse_args(argv)
 
 
-def update_scripts():
-  if os.environ.get('RUN_SLAVE_UPDATED_SCRIPTS'):
-    os.environ.pop('RUN_SLAVE_UPDATED_SCRIPTS')
-    return False
-
-  stream = annotator.StructuredAnnotationStream()
-
-  with stream.step('update_scripts') as s:
-    gclient_name = 'gclient'
-    if sys.platform.startswith('win'):
-      gclient_name += '.bat'
-    gclient_path = os.path.join(env.Build, os.pardir, 'depot_tools',
-                                gclient_name)
-    gclient_cmd = [gclient_path, 'sync', '--force', '--verbose', '--jobs=2',
-                   '--break_repo_locks']
-    try:
-      fd, output_json = tempfile.mkstemp()
-      os.close(fd)
-      gclient_cmd += ['--output-json', output_json]
-    except Exception:
-      # Super paranoia try block.
-      output_json = None
-    cmd_dict = {
-        'name': 'update_scripts',
-        'cmd': gclient_cmd,
-        'cwd': env.Build,
-    }
-    annotator.print_step(cmd_dict, os.environ, stream)
-    rv, _ = _run_command(gclient_cmd, cwd=env.Build)
-    if rv != 0:
-      s.step_text('gclient sync failed!')
-      s.step_exception()
-    elif output_json:
-      try:
-        with open(output_json, 'r') as f:
-          gclient_json = json.load(f)
-        for line in json.dumps(
-            gclient_json, sort_keys=True,
-            indent=4, separators=(',', ': ')).splitlines():
-          s.step_log_line('gclient_json', line)
-        s.step_log_end('gclient_json')
-
-        build_checkout = gclient_json['solutions'].get('build/')
-        if build_checkout:
-          s.step_text('%(scm)s - %(revision)s' % build_checkout)
-          s.set_build_property('build_scm', json.dumps(build_checkout['scm']))
-          s.set_build_property('build_revision',
-                               json.dumps(build_checkout['revision']))
-      except Exception as e:
-        s.step_text('Unable to process gclient JSON %s' % repr(e))
-        s.step_exception()
-      finally:
-        try:
-          os.remove(output_json)
-        except Exception as e:
-          LOGGER.warning("LEAKED: %s", output_json, exc_info=True)
-    else:
-      s.step_text('Unable to get SCM data')
-      s.step_exception()
-
-    os.environ['RUN_SLAVE_UPDATED_SCRIPTS'] = '1'
-
-    # After running update scripts, set PYTHONIOENCODING=UTF-8 for the real
-    # annotated_run.
-    os.environ['PYTHONIOENCODING'] = 'UTF-8'
-
-    return True
-
-
 def clean_old_recipe_engine():
   """Clean stale pycs from the old location of recipe_engine.
 
   This function should only be needed for a little while after the recipe
   packages rollout (2015-09-16).
   """
   for (dirpath, _, filenames) in os.walk(
       os.path.join(env.Build, 'third_party', 'recipe_engine')):
     for filename in filenames:
       if filename.endswith('.pyc'):
@@ skipping 123 matching lines @@
     properties['build_data_dir'] = build_data_dir
 
     # Write our annotated_run.py monitoring event.
     write_monitoring_event(config, build_data_dir, properties)
 
     # Execute our recipe.
     return _exec_recipe(rt, opts, basedir, tdir, config, properties)
 
 
 def shell_main(argv):
-  if update_scripts():
+  if update_scripts.update_scripts():
     # Re-execute with the updated annotated_run.py.
     rv, _ = _run_command([sys.executable] + argv)
     return rv
   else:
     return main(argv[1:])
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=logging.INFO)
   sys.exit(shell_main(sys.argv))