From 2bbd8a76805db8063d7dec62188b853b41fe298f Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Mon, 13 Sep 2021 21:20:55 +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/8836174376798977441 Please review the expectation changes, and LGTM+CQ. recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173 ffe1779 (yuanjunh@google.com) Unify Exception message when logging recipe crashes More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. R=nodir@chromium.org, tandrii@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Id39b22619c2098cc82bf6a4abdf776e2bcbc82e6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3158792 Auto-Submit: Recipe Roller Commit-Queue: Yuanjun Huang Reviewed-by: Yuanjun Huang --- 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 9ae1df8c9..476522703 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "fed60fabc22e2b89f8ad95e662ed4ef863fea6b9", + "revision": "ffe17790c212701a06373ab9fd0ce3a54dab9173", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 9fab59b59..09e20bb13 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/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fed60fabc22e2b89f8ad95e662ed4ef863fea6b9/recipe_engine/recipe_api.py#881 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/ffe17790c212701a06373ab9fd0ce3a54dab9173/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 43147064d..38552c2b3 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 @@ -66,7 +66,7 @@ " affected_files = api.gclient.diff_deps(api.path['cache'])", " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/gclient/api.py\", line 413, in diff_deps", " raise self.DepsDiffException(msg)", - "DepsDiffException: Couldn't checkout previous ref: fatal: bad object abcdef1234567890" + "DepsDiffException('Couldn't checkout previous ref: fatal: bad object abcdef1234567890')" ] }, { 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 d58e8137a..4205018d3 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 @@ -65,7 +65,7 @@ " affected_files = api.gclient.diff_deps(api.path['cache'])", " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/gclient/api.py\", line 429, in diff_deps", " raise self.DepsDiffException(msg)", - "DepsDiffException: Unexpected result: autoroll diff found 0 files changed" + "DepsDiffException('Unexpected result: autoroll diff found 0 files changed')" ] }, { 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 4572de08a..768f6b016 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 @@ -186,7 +186,7 @@ " api.git.new_branch('failed_new_branch', upstream='will_fail', upstream_current=True) #pylint: disable = line-too-long", " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/git/api.py\", line 420, in new_branch", " raise ValueError('Can not define both upstream and upstream_current')", - "ValueError: Can not define both upstream and upstream_current" + "ValueError('Can not define both upstream and upstream_current')" ] }, {