Commit 70276606 authored by recipe-roller's avatar recipe-roller Committed by Commit Bot

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/125d102e429465dc3468b4b235f9e3a5df4b252c Reland: Refactor recipe engine step execution. (iannucci@chromium.org)


R=recipe-roller@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I7736e6b20f8a7ec9d5cf9eeb21456a1d0b37f189
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1609964
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: 's avatarRobbie Iannucci <iannucci@chromium.org>
parent 66eeedc2
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"deps": { "deps": {
"recipe_engine": { "recipe_engine": {
"branch": "master", "branch": "master",
"revision": "9b3ed1d5e912b8e9195060c3401da9b5370f2fce", "revision": "125d102e429465dc3468b4b235f9e3a5df4b252c",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
} }
}, },
......
...@@ -997,19 +997,19 @@ Move things around in a loop! ...@@ -997,19 +997,19 @@ Move things around in a loop!
&mdash; **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** &mdash; **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/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-buildbucket [recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-cipd [recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-commit_position [recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-commit_position
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-context [recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-file [recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-json [recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-path [recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-platform [recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-properties [recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-python [recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-raw_io [recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-runtime [recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-source_manifest [recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-source_manifest
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-step [recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/README.recipes.md#recipe_modules-url [recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/README.recipes.md#recipe_modules-url
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/9b3ed1d5e912b8e9195060c3401da9b5370f2fce/recipe_engine/recipe_api.py#844 [recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/125d102e429465dc3468b4b235f9e3a5df4b252c/recipe_engine/recipe_api.py#836
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
}, },
{ {
"failure": { "failure": {
"humanReason": "Infra Failure: Step('bot_update') returned 1" "humanReason": "Infra Failure: Step('bot_update') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
{ {
"failure": { "failure": {
"failure": {}, "failure": {},
"humanReason": "Step('Patch failure') failed with return_code 1" "humanReason": "Step('Patch failure') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
}, },
{ {
"failure": { "failure": {
"humanReason": "Infra Failure: Step('Patch failure') returned 1" "humanReason": "Infra Failure: Step('Patch failure') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
{ {
"failure": { "failure": {
"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" "name": "$result"
} }
......
...@@ -281,6 +281,31 @@ ...@@ -281,6 +281,31 @@
"@@@STEP_LOG_END@json.output@@@" "@@@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": { "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\",)" "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\",)"
......
...@@ -281,6 +281,29 @@ ...@@ -281,6 +281,29 @@
"@@@STEP_LOG_END@json.output@@@" "@@@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": { "failure": {
"humanReason": "Uncaught Exception: ValueError(\"invalid value for install_mode: ''\",)" "humanReason": "Uncaught Exception: ValueError(\"invalid value for install_mode: ''\",)"
......
...@@ -281,6 +281,29 @@ ...@@ -281,6 +281,29 @@
"@@@STEP_LOG_END@json.output@@@" "@@@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": { "failure": {
"humanReason": "Uncaught Exception: ValueError('add_version_file() may only be used once.',)" "humanReason": "Uncaught Exception: ValueError('add_version_file() may only be used once.',)"
......
...@@ -277,6 +277,7 @@ ...@@ -277,6 +277,7 @@
}, },
{ {
"failure": { "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" "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" "name": "$result"
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
}, },
{ {
"failure": { "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" "name": "$result"
} }
......
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
}, },
{ {
"failure": { "failure": {
"humanReason": "Infra Failure: Step('my repo rebase') returned 1" "humanReason": "Infra Failure: Step('my repo rebase') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -131,14 +131,14 @@ ...@@ -131,14 +131,14 @@
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@foo@@@", "@@@STEP_TEXT@foo@@@",
"@@@STEP_FAILURE@@@", "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@",
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" "@@@STEP_FAILURE@@@"
] ]
}, },
{ {
"failure": { "failure": {
"failure": {}, "failure": {},
"humanReason": "Step('fail') failed with return_code 1" "humanReason": "Step('fail') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -131,14 +131,14 @@ ...@@ -131,14 +131,14 @@
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@foo@@@", "@@@STEP_TEXT@foo@@@",
"@@@STEP_FAILURE@@@", "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@",
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" "@@@STEP_FAILURE@@@"
] ]
}, },
{ {
"failure": { "failure": {
"failure": {}, "failure": {},
"humanReason": "Step('fail') failed with return_code 1" "humanReason": "Step('fail') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -29,14 +29,14 @@ ...@@ -29,14 +29,14 @@
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@foo@@@", "@@@STEP_TEXT@foo@@@",
"@@@STEP_FAILURE@@@", "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@",
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" "@@@STEP_FAILURE@@@"
] ]
}, },
{ {
"failure": { "failure": {
"failure": {}, "failure": {},
"humanReason": "Step('fail') failed with return_code 1" "humanReason": "Step('fail') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -29,14 +29,14 @@ ...@@ -29,14 +29,14 @@
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@foo@@@", "@@@STEP_TEXT@foo@@@",
"@@@STEP_FAILURE@@@", "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@",
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" "@@@STEP_FAILURE@@@"
] ]
}, },
{ {
"failure": { "failure": {
"failure": {}, "failure": {},
"humanReason": "Step('fail') failed with return_code 1" "humanReason": "Step('fail') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@foo@@@", "@@@STEP_TEXT@foo@@@",
"@@@STEP_FAILURE@@@", "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@",
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" "@@@STEP_FAILURE@@@"
] ]
}, },
{ {
"failure": { "failure": {
"failure": {}, "failure": {},
"humanReason": "Step('fail') failed with return_code 1" "humanReason": "Step('fail') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
"name": "fail", "name": "fail",
"~followup_annotations": [ "~followup_annotations": [
"@@@STEP_TEXT@foo@@@", "@@@STEP_TEXT@foo@@@",
"@@@STEP_FAILURE@@@", "@@@SET_BUILD_PROPERTY@failure_hash@\"622c0c52e65e6d0dc78957dd113ad343e57ae6d2\"@@@",
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@" "@@@STEP_FAILURE@@@"
] ]
}, },
{ {
"failure": { "failure": {
"failure": {}, "failure": {},
"humanReason": "Step('fail') failed with return_code 1" "humanReason": "Step('fail') (retcode: 1)"
}, },
"name": "$result" "name": "$result"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment