Manual roll for new run logic

Manual roll for https://crrev.com/c/1239574/ TBR=iannucci Recipe-Manual-Change: build Recipe-Manual-Change: infra Recipe-Manual-Change: build_limited_scripts_slave Recipe-Manual-Change: release_scripts Recipe-Manual-Change: skiabuildbot Recipe-Manual-Change: skia Bug: 646142 Change-Id: I56f156c05a695cfb00b9e0a7f335d516153a70c7 Reviewed-on: https://chromium-review.googlesource.com/c/1305041 Commit-Queue: Stephen Martinis <martiniss@chromium.org> Reviewed-by: Stephen Martinis <martiniss@chromium.org>

Manual roll for new run logic
Manual roll for https://crrev.com/c/1239574/ TBR=iannucci Recipe-Manual-Change: build Recipe-Manual-Change: infra Recipe-Manual-Change: build_limited_scripts_slave Recipe-Manual-Change: release_scripts Recipe-Manual-Change: skiabuildbot Recipe-Manual-Change: skia Bug: 646142 Change-Id: I56f156c05a695cfb00b9e0a7f335d516153a70c7 Reviewed-on: https://chromium-review.googlesource.com/c/1305041 Commit-Queue: Stephen Martinis <martiniss@chromium.org> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
9afc6490 · Stephen Martinis · Commit Bot · 5a9ff435 · 9afc6490 · 9afc6490
Commit 9afc6490 authored Oct 30, 2018 by Stephen Martinis Committed by Commit Bot Oct 30, 2018
105 changed files
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -15,7 +15,7 @@
  "deps": {
    "recipe_engine": {
      "branch": "master",
-      "revision": "04620158d8f45c68cc8bc39e30ce4a85c368046a",
+      "revision": "ee0e2c37c03936c3683be03d215f58d47d04ee08",
      "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
    }
  },

--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -993,4 +993,4 @@ Move things around in a loop!
 [recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04620158d8f45c68cc8bc39e30ce4a85c368046a/README.recipes.md#recipe_modules-source_manifest
 [recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04620158d8f45c68cc8bc39e30ce4a85c368046a/README.recipes.md#recipe_modules-step
 [recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04620158d8f45c68cc8bc39e30ce4a85c368046a/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04620158d8f45c68cc8bc39e30ce4a85c368046a/recipe_engine/recipe_api.py#1012
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/04620158d8f45c68cc8bc39e30ce4a85c368046a/recipe_engine/recipe_api.py#1015
--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
@@ -96,8 +96,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
@@ -96,8 +96,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
@@ -97,8 +97,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
@@ -184,8 +184,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
@@ -170,8 +170,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
@@ -184,8 +184,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
@@ -184,8 +184,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json
@@ -183,8 +183,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json
@@ -187,8 +187,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
@@ -234,8 +234,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json
@@ -185,8 +185,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
@@ -183,8 +183,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
@@ -77,9 +77,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Infra Failure: Step('bot_update') returned 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "bot_update"
+      },
+      "humanReason": "Infra Failure: Step('bot_update') returned 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
@@ -168,9 +168,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Step('Patch failure') failed with return_code 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "Patch failure"
+      },
+      "humanReason": "Step('Patch failure') failed with return_code 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
@@ -168,9 +168,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Infra Failure: Step('Patch failure') returned 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "Patch failure"
+      },
+      "humanReason": "Infra Failure: Step('Patch failure') returned 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
@@ -234,8 +234,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
@@ -230,8 +230,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
@@ -228,8 +228,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
@@ -234,8 +234,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
@@ -234,8 +234,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
@@ -234,8 +234,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
@@ -234,8 +234,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json
 [
  {
-    "name": "$result",
-    "reason": "invalid (host, project) pair in buildbucket.build.input.gitiles_commit: (u'unrecognized', u'repo') does not match any of configured gclient solutions and not present in gclient_config.repo_path_map",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": ""
+      },
+      "humanReason": "invalid (host, project) pair in buildbucket.build.input.gitiles_commit: (u'unrecognized', u'repo') does not match any of configured gclient solutions and not present in gclient_config.repo_path_map"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
@@ -96,8 +96,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
@@ -184,8 +184,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/basic.json
@@ -398,8 +398,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/basic_pkg.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/basic_pkg.json
@@ -398,8 +398,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json
@@ -74,9 +74,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Step('cipd describe public/package/linux-amd64') failed with return_code 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "cipd describe public/package/linux-amd64"
+      },
+      "humanReason": "Step('cipd describe public/package/linux-amd64') failed with return_code 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/describe-many-instances.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/describe-many-instances.json
@@ -406,8 +406,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/mac64.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/mac64.json
@@ -398,8 +398,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json
@@ -282,8 +282,14 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Uncaught Exception: ValueError(\"path Path('start_dir', 'a','path','to','file.py') is not the package root Path('start_dir', 'some_subdir') and not a child thereof\",)",
-    "status_code": -1
+    "failure": {
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
+      },
+      "humanReason": "Uncaught Exception: ValueError(\"path Path('start_dir', 'a','path','to','file.py') is not the package root Path('start_dir', 'some_subdir') and not a child thereof\",)"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json
@@ -282,8 +282,14 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Uncaught Exception: ValueError(\"invalid value for install_mode: ''\",)",
-    "status_code": -1
+    "failure": {
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
+      },
+      "humanReason": "Uncaught Exception: ValueError(\"invalid value for install_mode: ''\",)"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json
@@ -282,8 +282,14 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Uncaught Exception: ValueError('add_version_file() may only be used once.',)",
-    "status_code": -1
+    "failure": {
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
+      },
+      "humanReason": "Uncaught Exception: ValueError('add_version_file() may only be used once.',)"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/full.expected/win64.json
+++ b/recipes/recipe_modules/cipd/examples/full.expected/win64.json
@@ -398,8 +398,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/junk arch.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/junk arch.json
 [
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/junk bits.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/junk bits.json
 [
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_arm_32.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_arm_32.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_arm_64.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_arm_64.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_intel_32.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_intel_32.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_intel_64.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_intel_64.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_mips_64.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/linux_mips_64.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/mac_intel_64.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/mac_intel_64.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/win_intel_32.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/win_intel_32.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/cipd/examples/platform_suffix.expected/win_intel_64.json
+++ b/recipes/recipe_modules/cipd/examples/platform_suffix.expected/win_intel_64.json
@@ -7,8 +7,7 @@
    "name": "platform_suffix"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
@@ -68,8 +68,7 @@
    "name": "on_path"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json
@@ -68,8 +68,7 @@
    "name": "on_path"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json
@@ -68,8 +68,7 @@
    "name": "on_path"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gclient/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/gclient/examples/full.expected/basic.json
@@ -233,8 +233,7 @@
    "name": "gclient runhooks"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gclient/examples/full.expected/buildbot.json
+++ b/recipes/recipe_modules/gclient/examples/full.expected/buildbot.json
@@ -233,8 +233,7 @@
    "name": "gclient runhooks"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gclient/examples/full.expected/revision.json
+++ b/recipes/recipe_modules/gclient/examples/full.expected/revision.json
@@ -237,8 +237,7 @@
    "name": "gclient runhooks"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json
+++ b/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json
@@ -233,8 +233,7 @@
    "name": "gclient runhooks"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json
@@ -275,9 +275,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "2 out of 2 aggregated steps failed. Failures: Error quering for branch of CL 122, Error querying for CL description: host:'https://chromium-review.googlesource.com' change:122; patchset:3",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "Aggregate step failure."
+      },
+      "humanReason": "2 out of 2 aggregated steps failed. Failures: Error quering for branch of CL 122, Error querying for CL description: host:'https://chromium-review.googlesource.com' change:122; patchset:3"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic.json
@@ -217,8 +217,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic_branch.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_branch.json
@@ -217,8 +217,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json
@@ -219,8 +219,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic_hash.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_hash.json
@@ -216,8 +216,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic_luci.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_luci.json
@@ -216,8 +216,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic_ref.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_ref.json
@@ -217,8 +217,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json
@@ -218,8 +218,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/basic_tags.json
+++ b/recipes/recipe_modules/git/examples/full.expected/basic_tags.json
@@ -218,8 +218,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
@@ -162,9 +162,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Infra Failure: Step('git status can_fail_build') returned 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "git status can_fail_build"
+      },
+      "humanReason": "Infra Failure: Step('git status can_fail_build') returned 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json
@@ -221,8 +221,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json
+++ b/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json
@@ -241,8 +241,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json
@@ -292,8 +292,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json
@@ -221,8 +221,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json
@@ -222,8 +222,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
@@ -106,9 +106,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "count-objects failed: invalid literal for long() with base 10: 'xxx'",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": ""
+      },
+      "humanReason": "count-objects failed: invalid literal for long() with base 10: 'xxx'"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json
+++ b/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json
@@ -219,8 +219,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json
+++ b/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json
@@ -267,8 +267,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/platform_win.json
+++ b/recipes/recipe_modules/git/examples/full.expected/platform_win.json
@@ -217,8 +217,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
@@ -219,9 +219,12 @@
    "name": "my repo rebase abort"
  },
  {
-    "name": "$result",
-    "reason": "Infra Failure: Step('my repo rebase') returned 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "my repo rebase"
+      },
+      "humanReason": "Infra Failure: Step('my repo rebase') returned 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json
+++ b/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json
@@ -219,8 +219,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json
+++ b/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json
@@ -218,8 +218,7 @@
    "name": "git bundle"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
@@ -94,8 +94,7 @@
    "name": "echo (3)"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gitiles/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/gitiles/examples/full.expected/basic.json
@@ -591,8 +591,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gitiles/tests/parse_repo_url.expected/basic.json
+++ b/recipes/recipe_modules/gitiles/tests/parse_repo_url.expected/basic.json
 [
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/gsutil/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/gsutil/examples/full.expected/basic.json
@@ -190,8 +190,7 @@
    "name": "gsutil cat"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/basic.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_buildbot_linux.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_buildbot_linux.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_buildbot_mac.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_buildbot_mac.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_buildbot_win.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_buildbot_win.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_generic_linux.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_generic_linux.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_generic_mac.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_generic_mac.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_generic_win.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_generic_win.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json
@@ -9,8 +9,7 @@
    ]
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/osx_sdk/examples/full.expected/linux.json
+++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/linux.json
@@ -16,8 +16,7 @@
    "name": "ninja"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json
+++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json
@@ -76,8 +76,7 @@
    "name": "reset XCode"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/osx_sdk/examples/full.expected/win.json
+++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/win.json
@@ -16,8 +16,7 @@
    "name": "ninja"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json
@@ -11,8 +11,7 @@
    "name": "presubmit"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json
@@ -52,8 +52,7 @@
    "name": "patch_text test (2)"
  },
  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json
 [
  {
-    "name": "$result",
-    "reason": "boom!",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": ""
+      },
+      "humanReason": "boom!"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
@@ -136,9 +136,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Step('fail') failed with return_code 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "fail"
+      },
+      "humanReason": "Step('fail') failed with return_code 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
@@ -136,9 +136,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Step('fail') failed with return_code 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "fail"
+      },
+      "humanReason": "Step('fail') failed with return_code 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json
@@ -34,9 +34,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Step('fail') failed with return_code 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "fail"
+      },
+      "humanReason": "Step('fail') failed with return_code 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json
@@ -34,9 +34,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Step('fail') failed with return_code 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "fail"
+      },
+      "humanReason": "Step('fail') failed with return_code 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json
@@ -31,9 +31,12 @@
    ]
  },
  {
-    "name": "$result",
-    "reason": "Step('fail') failed with return_code 1",
-    "recipe_result": null,
-    "status_code": 1
+    "failure": {
+      "failure": {
+        "step": "fail"
+      },
+      "humanReason": "Step('fail') failed with return_code 1"
+    },
+    "name": "$result"
  }
 ]
\ No newline at end of file
--- a/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json
+++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json
--- a/recipes/recipe_modules/windows_sdk/examples/full.expected/linux.json
+++ b/recipes/recipe_modules/windows_sdk/examples/full.expected/linux.json
--- a/recipes/recipe_modules/windows_sdk/examples/full.expected/mac.json
+++ b/recipes/recipe_modules/windows_sdk/examples/full.expected/mac.json
--- a/recipes/recipe_modules/windows_sdk/examples/full.expected/win.json
+++ b/recipes/recipe_modules/windows_sdk/examples/full.expected/win.json
--- a/recipes/recipes/fetch_end_to_end_test.expected/basic.json
+++ b/recipes/recipes/fetch_end_to_end_test.expected/basic.json