From 68a0333ec735bb9e09cf59e864625c3d6dfd335b Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 24 Mar 2021 02:23:48 +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. Please review the expectation changes, and LGTM+CQ. recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36 3faa1ba (yiwzhang@google.com) cq: Use proto Output properties in cq recipe_module More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. R=dpranke@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I5cb2fc5927de1cecad74f2c7a25be875983556a2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2781195 Auto-Submit: Recipe Roller Commit-Queue: Dirk Pranke Reviewed-by: Dirk Pranke --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++---------- .../full.expected/tryjob_fail_patch.json | 1 + 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index af25c79f5..e464b69c2 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "3c382e042b7780dba972c10a26c592c14f1da1a6", + "revision": "3faa1bab09dc03d1a00503124303d60ae9599e36", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 807cf8fa6..d19246697 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1102,23 +1102,23 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3c382e042b7780dba972c10a26c592c14f1da1a6/recipe_engine/recipe_api.py#875 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/3faa1bab09dc03d1a00503124303d60ae9599e36/recipe_engine/recipe_api.py#875 diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json index 9b7e0469f..89d775106 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json @@ -171,6 +171,7 @@ "cmd": [], "name": "TRYJOB DO NOT RETRY", "~followup_annotations": [ + "@@@SET_BUILD_PROPERTY@$recipe_engine/cq/output@{\"retry\": \"OUTPUT_RETRY_DENIED\"}@@@", "@@@SET_BUILD_PROPERTY@do_not_retry@true@@@" ] },