From bc883aef4a5701d9dd033dd93afd101f7079ede9 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 15 Sep 2021 08:46:54 +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/8836068680053499857 Please review the expectation changes, and LGTM+CQ. recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d 1cc998a (chanli@chromium.org) Revert "[recipe-py] expose resultdb info in LUCI_CONTEXT" 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: Ib3634ea557ed2a830da4101a17ad59c1dc45ca28 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3161452 Auto-Submit: Recipe Roller Commit-Queue: Andrii Shyshkalov Reviewed-by: Andrii Shyshkalov --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++---------- .../examples/full.expected/basic.json | 6 --- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 4b3a3c536..0cd5b076d 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "28810c312f53fe68c22c9dcc8c6ef11f98590bd7", + "revision": "1cc998a726cf0fa9a9a52260771683bdca78e66d", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 6c1a3fd18..8f166ef00 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/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28810c312f53fe68c22c9dcc8c6ef11f98590bd7/recipe_engine/recipe_api.py#881 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1cc998a726cf0fa9a9a52260771683bdca78e66d/recipe_engine/recipe_api.py#881 diff --git a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json index c5b27cc3c..8c0683b19 100644 --- a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json +++ b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json @@ -1,9 +1,6 @@ [ { "cmd": [ - "rdb", - "stream", - "--", "vpython", "-u", "RECIPE_REPO[depot_tools]/presubmit_support.py", @@ -26,9 +23,6 @@ }, { "cmd": [ - "rdb", - "stream", - "--", "vpython3", "RECIPE_REPO[depot_tools]/presubmit_support.py", "--json_output",