Include "recipe_result" (None) on StepFailure

recipe_engine/run.py

 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # 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
 AddAnnotatedScript step. That step (found in annotator_commands.py) calls
@@ skipping 401 matching lines @@
         try:
           recipe_result = recipe_script.run(api, api._engine.properties)
           result = {
             "recipe_result": recipe_result,
             "status_code": 0
           }
         finally:
           self._close_to_level(0)
       except recipe_api.StepFailure as f:
         result = {
+          # Include "recipe_result" so it doesn't get marked as infra failure.
+          "recipe_result": None,
           "reason": f.reason,
           "status_code": f.retcode or 1
         }
       except types.StepDataAttributeError as ex:
         result = {
           "reason": "Invalid Step Data Access: %r" % ex,
           "traceback": traceback.format_exc().splitlines(),
           "status_code": -1
         }
 
@@ skipping 55 matching lines @@
         results.append(
           loader._invoke_with_properties(
             run_recipe, properties, recipe_script.PROPERTIES,
             properties.keys()))
       except TypeError as e:
         raise TypeError(
             "Got %r while trying to call recipe %s with properties %r" % (
               e, recipe, properties))
 
     return results