remote_run: make build purple on any infra failures

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
 import subprocess
 import sys
 import tempfile
 
 
 # Install Infra build environment.
 BUILD_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
                              os.path.abspath(__file__))))
 sys.path.insert(0, os.path.join(BUILD_ROOT, 'scripts'))
 
+from common import annotator
 from common import chromium_utils
 from common import env
 from slave import cipd
 from slave import infra_platform
 from slave import logdog_bootstrap
 from slave import monitoring_utils
 from slave import robust_tempdir
 from slave import update_scripts
 
 
@@ skipping 80 matching lines @@
     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_result_path = os.path.join(tempdir, 'recipe_result.json')
     recipe_cmd = [
         sys.executable,
         os.path.join(cipd_path, 'recipes.py'),
         '--verbose',
         'remote',
         '--repository', args.repository,
         '--revision', args.revision,
         '--workdir', os.path.join(tempdir, 'rw'),
         '--',
         '--verbose',
         'run',
         '--properties-file', properties_file,
         '--workdir', os.path.join(tempdir, 'w'),
+        '--output-result-json', recipe_result_path,
         args.recipe,
     ]
     # If we bootstrap through logdog, the recipe command line gets written
     # to a temporary file and does not appear in the log.
     LOGGER.info('Recipe command line: %r', recipe_cmd)
     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()
     except logdog_bootstrap.NotBootstrapped as e:
       LOGGER.info('Not bootstrapped: %s', e.message)
     except logdog_bootstrap.BootstrapError as e:
       LOGGER.warning('Could not bootstrap LogDog: %s', e.message)
     except Exception as e:
       LOGGER.exception('Exception while bootstrapping LogDog.')
     finally:
       if recipe_return_code is None:
         LOGGER.info('Not using LogDog. Invoking `recipes.py` directly.')
         recipe_return_code = _call(recipe_cmd)
+
+      # Try to open recipe result JSON. Any failure will result in an exception
+      # and an infra failure.
+      with open(recipe_result_path) as f:
+        json.load(f)
     return recipe_return_code
 
 
 def shell_main(argv):
   logging.basicConfig(
       level=(logging.DEBUG if '--verbose' in argv else logging.INFO))
 
   if update_scripts.update_scripts():
     # Re-execute with the updated remote_run.py.
     return _call([sys.executable] + argv)
 
-  return main(argv)
+  stream = annotator.StructuredAnnotationStream()
+  with stream.step('remote_run_result'):

[martiniss, 2016/07/08 21:10:29]

Why is this here? You're creating another step before you start running the
recipe?

[Paweł Hajdan Jr., 2016/07/11 11:21:07]

Yes, this way I can turn that step purple e.g. on any exceptions.

This was the best use of annotator I could find. I'd be fine if there's a better
alternative.

+    return main(argv)
 
 
 if __name__ == '__main__':
   sys.exit(shell_main(sys.argv))