From 940c4a01db82483ecb6c213709742ab86ff239fc Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Mon, 13 Nov 2023 21:34:45 +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/8764509030854892129 Please review the expectation changes, and LGTM+CQ. recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7 20788e5 (mohrr@google.com) [recipe_engine] Always show full stacks Please check the following references for more information: - autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller - rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback - cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md Use https://goo.gl/noib3a to file a bug. R=iannucci@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Ignore-Freeze: Autoroller Bugdroid-Send-Email: False Change-Id: Idb9047f921b1740485954fa5aa6e9b47a4e857d2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5026363 Commit-Queue: Robbie Iannucci Auto-Submit: Recipe Roller Reviewed-by: Robbie Iannucci --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 44 +++++++++---------- .../full.expected/new_branch_failed.json | 14 +++++- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index e4e0b0231..79e7f0b33 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "2e756c9e02a897714889b90a469b960c110e1640", + "revision": "20788e5b9b302f55266d5d0bb594b6b5ad1b50a7", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 5711bc906..306df5447 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1210,25 +1210,25 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#16)(api):** -[recipe_engine/recipe_modules/archive]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-archive -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-led -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-time -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/2e756c9e02a897714889b90a469b960c110e1640/recipe_engine/recipe_api.py#473 +[recipe_engine/recipe_modules/archive]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-archive +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-led +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-time +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/20788e5b9b302f55266d5d0bb594b6b5ad1b50a7/recipe_engine/recipe_api.py#473 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 bae225858..5084d693b 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 @@ -182,12 +182,24 @@ "The recipe has crashed at point 'Uncaught exception'!", "", "Traceback (most recent call last):", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps", + " raw_result = recipe_obj.run_steps(api, engine)", + " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps", + " recipe_result = invoke_with_properties(", + " ^^^^^^^^^^^^^^^^^^^^^^^", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties", + " return _invoke_with_properties(callable_obj, all_props, environ, prop_defs,", + " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties", + " return callable_obj(*props, **additional_args)", + " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/git/examples/full.py\", line 81, in RunSteps", " 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 403, 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" ] }, {