annotated_run: Use builder directory for temp.

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 json
 import logging
 import os
 import subprocess
@@ skipping 10 matching lines @@
 from common import env
 from common import master_cfg_utils
 from slave import logdog_bootstrap
 from slave import monitoring_utils
 from slave import robust_tempdir
 from slave import update_scripts
 
 # Logging instance.
 LOGGER = logging.getLogger('annotated_run')
 
+# /b/build/slave/<slavename>/build/
+BUILD_DIR = os.getcwd()
+# /b/build/slave/<slavename>/
+BUILDER_DIR = os.path.dirname(BUILD_DIR)
+
+def _build_dir():
+  return BUILD_DIR
+
+def _builder_dir():
+  return BUILDER_DIR
+
 def _ensure_directory(*path):
   path = os.path.join(*path)
   if not os.path.isdir(path):
     os.makedirs(path)
   return path
 
 
 def _run_command(cmd, **kwargs):
   if kwargs.pop('dry_run', False):
     LOGGER.info('(Dry Run) Would have executed command: %s', cmd)
@@ skipping 204 matching lines @@
 
   # Dump properties to JSON and build recipe command.
   props_file = os.path.join(tdir, 'recipe_properties.json')
   with open(props_file, 'w') as fh:
     json.dump(properties, fh)
 
   recipe_cmd = [
       sys.executable, '-u', recipe_runner,
       '--verbose',
       'run',
-      '--workdir=%s' % os.getcwd(),
+      '--workdir=%s' % _build_dir(),
       '--properties-file=%s' % props_file,
       properties['recipe'],
   ]
 
   recipe_return_code = None
   try:
     bs = logdog_bootstrap.bootstrap(rt, opts, basedir, tdir, properties,
                                     recipe_cmd)
 
     LOGGER.info('Bootstrapping through LogDog: %s', bs.cmd)
@@ skipping 17 matching lines @@
 
   if opts.verbose == 0:
     level = logging.INFO
   else:
     level = logging.DEBUG
   logging.getLogger().setLevel(level)
 
   clean_old_recipe_engine()
 
   # Enter our runtime environment.
-  basedir = os.getcwd()
+  basedir = _builder_dir()
   with robust_tempdir.RobustTempdir(
       prefix='.recipe_runtime', leak=opts.leak) as rt:
     tdir = rt.tempdir(base=basedir)
     LOGGER.debug('Using temporary directory: [%s].', tdir)
 
     # Load factory properties and configuration.
     # TODO(crbug.com/551165): remove flag "factory_properties".
     use_factory_properties_from_disk = (opts.use_factory_properties_from_disk or
                                         bool(opts.factory_properties))
     properties = get_recipe_properties(
@@ skipping 16 matching lines @@
     # 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))