From 417f2332fcf4aaebee260e98046d850833bf0487 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Mon, 13 May 2019 20:32:26 +0000 Subject: [PATCH] Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. recipe_engine: https://crrev.com/440a45cae6b329192f60313e41714bd78e886c8d Refactor recipe engine step execution. (iannucci@chromium.org) R=recipe-roller@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I6e85bbfdf2eb61a433a505f81db6b805b9231402 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1610858 Commit-Queue: Recipe Roller Commit-Queue: Robbie Iannucci Reviewed-by: Robbie Iannucci --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 32 +++++++++---------- .../examples/full.expected/tryjob_fail.json | 2 +- .../full.expected/tryjob_fail_patch.json | 2 +- .../tryjob_fail_patch_download.json | 2 +- .../full.expected/describe-failed.json | 2 +- .../examples/full.expected/pkg_bad_file.json | 25 +++++++++++++++ .../examples/full.expected/pkg_bad_mode.json | 23 +++++++++++++ .../full.expected/pkg_bad_verfile.json | 23 +++++++++++++ .../gerrit/examples/full.expected/basic.json | 1 + .../full.expected/can_fail_build.json | 2 +- .../examples/full.expected/rebase_failed.json | 2 +- .../full.expected/with_gerrit_patch.json | 6 ++-- .../with_gerrit_patch_and_target_ref.json | 6 ++-- .../full.expected/with_git_patch.json | 6 ++-- .../full.expected/with_git_patch_luci.json | 6 ++-- .../full.expected/with_wrong_patch.json | 6 ++-- .../full.expected/with_wrong_patch_new.json | 6 ++-- 18 files changed, 113 insertions(+), 41 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 99754b2e7..62e796a5d 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -15,7 +15,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "f34152acbe36ba6b4dc513885271cfca8838a634", + "revision": "440a45cae6b329192f60313e41714bd78e886c8d", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index f42727284..7d071baa0 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -997,19 +997,19 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-source_manifest -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/README.recipes.md#recipe_modules-url -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f34152acbe36ba6b4dc513885271cfca8838a634/recipe_engine/recipe_api.py#844 +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-source_manifest +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/README.recipes.md#recipe_modules-url +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/440a45cae6b329192f60313e41714bd78e886c8d/recipe_engine/recipe_api.py#836 diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json index 0aa87f084..614b7ecc7 100644 --- 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,7 +77,7 @@ }, { "failure": { - "humanReason": "Infra Failure: Step('bot_update') returned 1" + "humanReason": "Infra Failure: Step('bot_update') (retcode: 1)" }, "name": "$result" } diff --git 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 index 6db9649a6..a3c31b5ff 100644 --- 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 @@ -176,7 +176,7 @@ { "failure": { "failure": {}, - "humanReason": "Step('Patch failure') failed with return_code 1" + "humanReason": "Step('Patch failure') (retcode: 1)" }, "name": "$result" } diff --git 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 index db89d7907..f1b5af919 100644 --- 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 @@ -175,7 +175,7 @@ }, { "failure": { - "humanReason": "Infra Failure: Step('Patch failure') returned 1" + "humanReason": "Infra Failure: Step('Patch failure') (retcode: 1)" }, "name": "$result" } diff --git a/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json b/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json index 667b32cba..1c29185fb 100644 --- a/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json +++ b/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json @@ -75,7 +75,7 @@ { "failure": { "failure": {}, - "humanReason": "Step('cipd describe public/package/linux-amd64') failed with return_code 1" + "humanReason": "Step('cipd describe public/package/linux-amd64') (retcode: 1)" }, "name": "$result" } diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json index 3962924bb..404abe1a8 100644 --- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json +++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json @@ -281,6 +281,31 @@ "@@@STEP_LOG_END@json.output@@@" ] }, + { + "cmd": [], + "name": "RECIPE CRASH (Uncaught exception)", + "~followup_annotations": [ + "@@@STEP_EXCEPTION@@@", + "The recipe has crashed at point 'Uncaught exception'!", + "", + "Traceback (most recent call last):", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", line 375, in run_steps", + " raw_result = recipe_obj.run_steps(api, engine)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", line 670, in run_steps", + " properties_def, api=api)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 89, in invoke_with_properties", + " arg_names, **additional_args)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 52, in _invoke_with_properties", + " return callable_obj(*props, **additional_args)", + " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 70, in RunSteps", + " pkg.add_file(api.path.abs_to_path(fullpath))", + " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/api.py\", line 115, in add_file", + " self.files.append(self._rel_path(file_path))", + " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/api.py\", line 81, in _rel_path", + " (path, self.package_root))", + "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" + ] + }, { "failure": { "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\",)" diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json index 55860be37..4cc1999c5 100644 --- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json +++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json @@ -281,6 +281,29 @@ "@@@STEP_LOG_END@json.output@@@" ] }, + { + "cmd": [], + "name": "RECIPE CRASH (Uncaught exception)", + "~followup_annotations": [ + "@@@STEP_EXCEPTION@@@", + "The recipe has crashed at point 'Uncaught exception'!", + "", + "Traceback (most recent call last):", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", line 375, in run_steps", + " raw_result = recipe_obj.run_steps(api, engine)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", line 670, in run_steps", + " properties_def, api=api)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 89, in invoke_with_properties", + " arg_names, **additional_args)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 52, in _invoke_with_properties", + " return callable_obj(*props, **additional_args)", + " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 68, in RunSteps", + " pkg = api.cipd.PackageDefinition('infra/fake-package', root, install_mode)", + " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/api.py\", line 64, in __init__", + " raise ValueError('invalid value for install_mode: %r' % install_mode)", + "ValueError: invalid value for install_mode: ''" + ] + }, { "failure": { "humanReason": "Uncaught Exception: ValueError(\"invalid value for install_mode: ''\",)" diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json index bc12e6a0b..f2ac82049 100644 --- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json +++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json @@ -281,6 +281,29 @@ "@@@STEP_LOG_END@json.output@@@" ] }, + { + "cmd": [], + "name": "RECIPE CRASH (Uncaught exception)", + "~followup_annotations": [ + "@@@STEP_EXCEPTION@@@", + "The recipe has crashed at point 'Uncaught exception'!", + "", + "Traceback (most recent call last):", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", line 375, in run_steps", + " raw_result = recipe_obj.run_steps(api, engine)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", line 670, in run_steps", + " properties_def, api=api)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 89, in invoke_with_properties", + " arg_names, **additional_args)", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 52, in _invoke_with_properties", + " return callable_obj(*props, **additional_args)", + " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 76, in RunSteps", + " pkg.add_version_file(pth)", + " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/api.py\", line 141, in add_version_file", + " raise ValueError('add_version_file() may only be used once.')", + "ValueError: add_version_file() may only be used once." + ] + }, { "failure": { "humanReason": "Uncaught Exception: ValueError('add_version_file() may only be used once.',)" diff --git a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json index 5cf761854..3fabead41 100644 --- a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json @@ -277,6 +277,7 @@ }, { "failure": { + "failure": {}, "humanReason": "1 out of 1 aggregated steps failed: Error querying for CL description: host:'https://chromium-review.googlesource.com' change:122; patchset:3" }, "name": "$result" diff --git a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json index 1cf39391d..65633b16a 100644 --- 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,7 +162,7 @@ }, { "failure": { - "humanReason": "Infra Failure: Step('git status can_fail_build') returned 1" + "humanReason": "Infra Failure: Step('git status can_fail_build') (retcode: 1)" }, "name": "$result" } diff --git a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json index dc2a28c3a..a19b0480d 100644 --- a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json +++ b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json @@ -219,7 +219,7 @@ }, { "failure": { - "humanReason": "Infra Failure: Step('my repo rebase') returned 1" + "humanReason": "Infra Failure: Step('my repo rebase') (retcode: 1)" }, "name": "$result" } diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json index 47b314649..3954cf323 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json @@ -131,14 +131,14 @@ "name": "fail", "~followup_annotations": [ "@@@STEP_TEXT@foo@@@", - "@@@STEP_FAILURE@@@", - "@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" + "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@", + "@@@STEP_FAILURE@@@" ] }, { "failure": { "failure": {}, - "humanReason": "Step('fail') failed with return_code 1" + "humanReason": "Step('fail') (retcode: 1)" }, "name": "$result" } diff --git 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 index 6ae6537ae..828ad19f2 100644 --- 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 @@ -131,14 +131,14 @@ "name": "fail", "~followup_annotations": [ "@@@STEP_TEXT@foo@@@", - "@@@STEP_FAILURE@@@", - "@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" + "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@", + "@@@STEP_FAILURE@@@" ] }, { "failure": { "failure": {}, - "humanReason": "Step('fail') failed with return_code 1" + "humanReason": "Step('fail') (retcode: 1)" }, "name": "$result" } diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json b/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json index c809929fb..0255b2ccf 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json @@ -29,14 +29,14 @@ "name": "fail", "~followup_annotations": [ "@@@STEP_TEXT@foo@@@", - "@@@STEP_FAILURE@@@", - "@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" + "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@", + "@@@STEP_FAILURE@@@" ] }, { "failure": { "failure": {}, - "humanReason": "Step('fail') failed with return_code 1" + "humanReason": "Step('fail') (retcode: 1)" }, "name": "$result" } diff --git 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 index c809929fb..0255b2ccf 100644 --- 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 @@ -29,14 +29,14 @@ "name": "fail", "~followup_annotations": [ "@@@STEP_TEXT@foo@@@", - "@@@STEP_FAILURE@@@", - "@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" + "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@", + "@@@STEP_FAILURE@@@" ] }, { "failure": { "failure": {}, - "humanReason": "Step('fail') failed with return_code 1" + "humanReason": "Step('fail') (retcode: 1)" }, "name": "$result" } diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json b/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json index 494d72723..7a4b3c006 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json @@ -26,14 +26,14 @@ "name": "fail", "~followup_annotations": [ "@@@STEP_TEXT@foo@@@", - "@@@STEP_FAILURE@@@", - "@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" + "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@", + "@@@STEP_FAILURE@@@" ] }, { "failure": { "failure": {}, - "humanReason": "Step('fail') failed with return_code 1" + "humanReason": "Step('fail') (retcode: 1)" }, "name": "$result" } diff --git 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 index bcd02464d..99291478d 100644 --- 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 @@ -27,14 +27,14 @@ "name": "fail", "~followup_annotations": [ "@@@STEP_TEXT@foo@@@", - "@@@STEP_FAILURE@@@", - "@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" + "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@", + "@@@STEP_FAILURE@@@" ] }, { "failure": { "failure": {}, - "humanReason": "Step('fail') failed with return_code 1" + "humanReason": "Step('fail') (retcode: 1)" }, "name": "$result" }