Modify annotated_run to read factory configs from the slave checkout.

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 json
 import optparse
 import os
 import subprocess
 import sys
 
 BUILD_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
     os.path.abspath(__file__))))
 sys.path.append(os.path.join(BUILD_ROOT, 'scripts'))
 sys.path.append(os.path.join(BUILD_ROOT, 'third_party'))
 
 from common import annotator
 from common import chromium_utils
 from slave import recipe_universe
 
 from recipe_engine import main as recipe_main
 
 
 def get_recipe_properties(factory_properties, build_properties):
   """Constructs the recipe's properties from buildbot's properties.
 
-  This merges factory_properties and build_properties.  Furthermore, it
-  tries to reconstruct the 'recipe' property from builders.pyl if it isn't
-  already there, and in that case merges in properties form builders.pyl.
+  This retrieves the current factory properties from the master_config
+  in the slave's checkout (the factory properties handed to us from the
+  master might be out of date), and merges in the build properties.
+
+  Using the values from the checkout allows us to do things like change
+  the recipe and other factory properties for a builder without needing
+  a master restart.
   """
-  properties = factory_properties.copy()
+  mastername = factory_properties['mastername']
+  buildername = factory_properties['buildername']

[Paweł Hajdan Jr., 2015/06/11 08:38:19]

How does this interact with e.g. running a recipe locally with run_recipe.py
with a different mastername and buildername than in buildbot config (or just
without these properties) for testing?

+
+  # Get the recipe and otherfactory properties from the current
+  # checked-out copies of the master.cfg on the slave, rather than taking what
+  # was handed to us from the master. The latter might be out-of-date.
+  script_path = os.path.join(BUILD_ROOT, 'scripts', 'slave',
+                             'dump_factory_properties.py')
+  dump_cmd = [sys.executable,
+              script_path,
+              mastername,
+              buildername]
+  proc = subprocess.Popen(dump_cmd, cwd=BUILD_ROOT, stdout=subprocess.PIPE)
+  out, _ = proc.communicate()
+  output_obj = json.loads(out)
+
+  if output_obj['result']:
+    raise LookupError('Failed to get the current factory properties for '
+                      '%s on %s: %s' % (buildername, mastername,
+                                        output_obj['message']))
+
+  if 'recipe' not in output_obj['factory_properties']:
+    raise LookupError('Cannot find recipe for %s on %s' %
+                      (buildername, mastername))
+
+  properties = output_obj['factory_properties'].copy()
   properties.update(build_properties)
-
-  # Try to reconstruct the recipe from builders.pyl if not given.
-  if 'recipe' not in properties:
-    mastername = properties['mastername']
-    buildername = properties['buildername']
-
-    master_path = chromium_utils.MasterPath(mastername)
-    builders_file = os.path.join(master_path, 'builders.pyl')
-    if os.path.isfile(builders_file):
-      builders = chromium_utils.ReadBuildersFile(builders_file)
-      assert buildername in builders['builders'], (
-        'buildername %s is not listed in %s' % (buildername, builders_file))
-      builder = builders['builders'][buildername]
-
-      # Update properties with builders.pyl data.
-      properties['recipe'] = builder['recipe']
-      properties.update(builder.get('properties', {}))
-    else:
-      raise LookupError('Cannot find recipe for %s on %s' %
-                        (build_properties['buildername'],
-                        build_properties['mastername']))
   return properties
 
 
 def get_args(argv):
   """Process command-line arguments."""
 
   parser = optparse.OptionParser(
       description='Entry point for annotated builds.')
   parser.add_option('--build-properties',
                     action='callback', callback=chromium_utils.convert_json,
@@ skipping 58 matching lines @@
 
 
 def shell_main(argv):
   if update_scripts():
     return subprocess.call([sys.executable] + argv)
   else:
     return main(argv)
 
 if __name__ == '__main__':
   sys.exit(shell_main(sys.argv))