remote_run: use /b as base directory for temporary files when available

scripts/slave/remote_run.py

 #!/usr/bin/env python
 # Copyright 2016 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 copy
 import json
 import logging
 import os
@@ skipping 70 matching lines @@
   logdog_bootstrap.add_arguments(group)
 
   args = parser.parse_args(argv[1:])
 
   # Keep CIPD directory between builds.
   cipd_path = os.path.join(os.getcwd(), '.remote_run_cipd')
   _install_cipd_packages(
       cipd_path, cipd.CipdPackage('infra/recipes-py', 'latest'))
 
   with robust_tempdir.RobustTempdir(
-      prefix='.remote_run', leak=args.leak) as rt:
-    # Use base directory inside system temporary directory - if we use slave
-    # one (cwd), the paths get too long. Recipes which need different paths
-    # or persistent directories should do so explicitly.
-    basedir = tempfile.gettempdir()
+      prefix='rr', leak=args.leak) as rt:
+    try:
+      basedir = chromium_utils.FindUpward(os.getcwd(), 'b')
+    except chromium_utils.PathNotFound as e:
+      LOGGER.warn(e)
+      # Use base directory inside system temporary directory - if we use slave
+      # one (cwd), the paths get too long. Recipes which need different paths
+      # or persistent directories should do so explicitly.
+      basedir = tempfile.gettempdir()
 
     # Explicitly clean up possibly leaked temporary directories
     # from previous runs.
     rt.cleanup(basedir)
 
     tempdir = rt.tempdir(basedir)
     LOGGER.info('Using temporary directory: [%s].', tempdir)
 
     build_data_dir = rt.tempdir(basedir)
     LOGGER.info('Using build data directory: [%s].', build_data_dir)
 
     properties = copy.copy(args.factory_properties)
     properties.update(args.build_properties)
     properties['build_data_dir'] = build_data_dir
     LOGGER.info('Using properties: %r', properties)
     properties_file = os.path.join(tempdir, 'remote_run_properties.json')
     with open(properties_file, 'w') as f:
       json.dump(properties, f)
 
     monitoring_utils.write_build_monitoring_event(build_data_dir, properties)
 
     recipe_cmd = [
         sys.executable,
         os.path.join(cipd_path, 'recipes.py'),
         'remote_run',
         '--repository', args.repository,
         '--revision', args.revision,
-        '--workdir', os.path.join(tempdir, 'remote_run_workdir'),
+        '--workdir', os.path.join(tempdir, 'rw'),
         '--',
         '--properties-file', properties_file,
-        '--workdir', os.path.join(tempdir, 'work'),
+        '--workdir', os.path.join(tempdir, 'w'),
         args.recipe,
     ]
     recipe_return_code = None
     try:
       bs = logdog_bootstrap.bootstrap(rt, args, basedir, tempdir, properties,
                                       recipe_cmd)
 
       LOGGER.info('Bootstrapping through LogDog: %s', bs.cmd)
       _ = _call(bs.cmd)
       recipe_return_code = bs.get_result()
@@ skipping 16 matching lines @@
 
   if update_scripts.update_scripts():
     # Re-execute with the updated remote_run.py.
     return _call([sys.executable] + argv)
 
   return main(argv)
 
 
 if __name__ == '__main__':
   sys.exit(shell_main(sys.argv))