From 78f91964318b870d274009a77b345920b5b93043 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Thu, 9 Sep 2021 20:35:18 +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 (recipe_engine) into this repository. The build that created this CL was https://ci.chromium.org/b/8836604083731327505 Please review the expectation changes, and LGTM+CQ. recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3 776c6d5 (yuanjunh@google.com) [python3] Format Exception message when running steps More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. R=gavinmak@google.com, tandrii@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I2125a87e05f4e336131890ac2dbf2d3461606842 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3150698 Auto-Submit: Recipe Roller Commit-Queue: Gavin Mak Reviewed-by: Gavin Mak --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++---------- .../dont have revision yet.json | 2 +- .../no change, exception.json | 2 +- .../full.expected/new_branch_failed.json | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index db8c9cd54a..62d7720f50 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "cc2189852d46923cc745bd1682d5c2f058bb3344", + "revision": "776c6d56a8186472ed5c47508ffeb96415ebcba3", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 521584bd06..a47cd9e3a7 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1104,23 +1104,23 @@ PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#15)(api):** -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/cc2189852d46923cc745bd1682d5c2f058bb3344/recipe_engine/recipe_api.py#881 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/776c6d56a8186472ed5c47508ffeb96415ebcba3/recipe_engine/recipe_api.py#881 diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json index b23667eeeb..43147064db 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json @@ -71,7 +71,7 @@ }, { "failure": { - "humanReason": "Uncaught Exception: DepsDiffException(u\"Couldn't checkout previous ref: fatal: bad object abcdef1234567890\",)" + "humanReason": "Uncaught Exception: DepsDiffException('Couldn't checkout previous ref: fatal: bad object abcdef1234567890')" }, "name": "$result" } diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json index fffbe0fb58..d58e8137a0 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json @@ -70,7 +70,7 @@ }, { "failure": { - "humanReason": "Uncaught Exception: DepsDiffException('Unexpected result: autoroll diff found 0 files changed',)" + "humanReason": "Uncaught Exception: DepsDiffException('Unexpected result: autoroll diff found 0 files changed')" }, "name": "$result" } diff --git a/recipes/recipe_modules/git/examples/full.expected/new_branch_failed.json b/recipes/recipe_modules/git/examples/full.expected/new_branch_failed.json index 56d2f1735a..04b50d3980 100644 --- a/recipes/recipe_modules/git/examples/full.expected/new_branch_failed.json +++ b/recipes/recipe_modules/git/examples/full.expected/new_branch_failed.json @@ -191,7 +191,7 @@ }, { "failure": { - "humanReason": "Uncaught Exception: ValueError('Can not define both upstream and upstream_current',)" + "humanReason": "Uncaught Exception: ValueError('Can not define both upstream and upstream_current')" }, "name": "$result" }