Modify annotated_run to read factory configs from the slave checkout.

scripts/tools/run_recipe.py

Index: scripts/tools/run_recipe.py
diff --git a/scripts/tools/run_recipe.py b/scripts/tools/run_recipe.py
index c702cd199c23ec5652fb103113bad5010d9c9286..f85373d972487704ed2ae828af5fc4c41f3150cc 100755
--- a/scripts/tools/run_recipe.py
+++ b/scripts/tools/run_recipe.py
@@ -75,6 +75,7 @@ def parse_args(args):
   parser = argparse.ArgumentParser(usage=USAGE)
   parser.add_argument('recipe')
   parser.add_argument('--properties-file')
+  parser.add_argument('--master-overrides-slave', action='store_true')

[Paweł Hajdan Jr., 2015/06/12 09:24:11]

FWIW, don't we _always_ want this with run_recipe? What would be an example case
where other behavior would be preferred or desirable?

[Dirk Pranke, 2015/06/12 15:42:37]

If you want to reproduce what is actually happening on the bot, you don't want
this
flag, because you want the slave's checkout to override what the master passed
in.

If you want to test new changes, you probably do want this flag.

I'm not sure which case is more common.

If we modify the command that we print out in the build log to show the values
we actually
used rather than the values passed to run_recipe, then the first case probably
goes away.

   known_args, extra_args = parser.parse_known_args(args)
 
   if known_args.properties_file:
@@ -89,7 +90,7 @@ def parse_args(args):
 
   assert type(properties) is dict
   properties['recipe'] = known_args.recipe
-  return properties
+  return properties, known_args.master_overrides_slave
 
 
 def get_properties_from_args(args):
@@ -109,7 +110,7 @@ def get_properties_from_file(filename):
 
 def main(args):
   """Gets the recipe name and properties and runs an annotated run."""
-  properties = parse_args(args)
+  properties, master_overrides_slave = parse_args(args)
   properties.setdefault('use_mirror', False)
 
   if not os.path.exists(SLAVE_DIR):
@@ -125,13 +126,15 @@ def main(args):
   env['PYTHONUNBUFFERED'] = '1'
   env['PYTHONIOENCODING'] = 'UTF-8'
 
-  return subprocess.call(
-      ['python', '-u', RUNIT, 'python', '-u', ANNOTATED_RUN,
-       '--keep-stdin',  # so that pdb works for local execution
-       '--factory-properties', json.dumps(properties),
-       '--build-properties', json.dumps(properties)],
-      cwd=SLAVE_DIR,
-      env=env)
+  cmd = ['python', '-u', RUNIT, 'python', '-u', ANNOTATED_RUN,
+         '--keep-stdin',  # so that pdb works for local execution
+         '--factory-properties', json.dumps(properties),
+         '--build-properties', json.dumps(properties)]
+
+  if master_overrides_slave:
+    cmd.append('--master-overrides-slave')
+
+  return subprocess.call(cmd, cwd=SLAVE_DIR, env=env)
 
 
 if __name__ == '__main__':