Made annotated_run look up recipe from builders.pyl masters.

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.
 
 """Entry point for fully-annotated builds.
 
 This script is part of the effort to move all builds to annotator-based
 systems. Any builder configured to use the AnnotatorFactory.BaseFactory()
 found in scripts/master/factory/annotator_factory.py executes a single
@@ skipping 298 matching lines @@
 
   ret = run_steps(stream, opts.build_properties, opts.factory_properties)
   return ret.status_code
 
 
 # Return value of run_steps and RecipeEngine.run.
 RecipeExecutionResult = collections.namedtuple(
     'RecipeExecutionResult', 'status_code steps_ran')
 
 
+def find_recipe(build_properties):

[iannucci, 2015/02/03 22:29:23]

trick:

  def find_recipe(recipe=None, mastername=None, buildername=None, **_unused):

If you want :)

+  """Finds the recipe to run from build_properties.
+
+  If it is not in build_properties, tries to find it in builders.pyl of the
+  master.  Mutates build_properties to include it in this case.
+  """
+  if 'recipe' in build_properties:
+    return build_properties['recipe']
+
+  master_path = chromium_utils.MasterPath(build_properties['mastername'])
+  builders_file = os.path.join(master_path, 'builders.pyl')
+  if os.path.isfile(builders_file):
+    builders = chromium_utils.ReadBuildersFile(builders_file)
+    builder = builders['builders'][build_properties['buildername']]

[iannucci, 2015/02/03 22:29:23]

this could raise if ['builders'] doesn't have the buildername. just FYI

+    recipe = builder['recipe']
+    build_properties['recipe'] = recipe

[iannucci, 2015/02/03 22:29:23]

/me flips out

nooooo!!!!! caller should modify build_properties :(

+    return recipe

[iannucci, 2015/02/03 22:29:23]

TODO: also return builders['builders'][buildername']['properties'] to .update()
into build_properties?

+
+  raise LookupError('Cannot find recipe for %s on %s' %
+                    (build_properties['buildername'],
+                    build_properties['mastername']))
+
+
 def run_steps(stream, build_properties, factory_properties,
               test_data=recipe_test_api.DisabledTestData()):
   """Returns a tuple of (status_code, steps_ran).
 
   Only one of these values will be set at a time. This is mainly to support the
   testing interface used by unittests/recipes_test.py.
   """
   stream.honor_zero_return_code()
 
   # TODO(iannucci): Stop this when blamelist becomes sane data.
@@ skipping 22 matching lines @@
   # It's an integration point with a new recipe engine that can run steps
   # in parallel (that is not implemented yet). Use new engine only if explicitly
   # asked by setting 'engine' property to 'ParallelRecipeEngine'.
   engine = RecipeEngine.create(stream, properties, test_data)
 
   # Create all API modules and an instance of top level GenSteps generator.
   # It doesn't launch any recipe code yet (generator needs to be iterated upon
   # to start executing code).
   api = None
   with stream.step('setup_build') as s:
-    assert 'recipe' in factory_properties
-    recipe = factory_properties['recipe']
+    recipe = find_recipe(build_properties)
 
     properties_to_print = properties.copy()
     if 'use_mirror' in properties:
       del properties_to_print['use_mirror']
 
     run_recipe_help_lines = [
         'To repro this locally, run the following line from a build checkout:',
         '',
         './scripts/tools/run_recipe.py %s --properties-file - <<EOF' % recipe,
         repr(properties_to_print),
@@ skipping 290 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))