From b47c95a58a1cc99083adb4941007e2b43e488aed Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Wed, 12 May 2021 10:05:25 +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/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e f4c9a77 (olivernewman@google.com) [buildbucket] Make default git_ref consistent More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. R=iannucci@chromium.org, tandrii@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I6b5526f445bbb7337ce8d18e10e855f7a91c587f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2885939 Auto-Submit: Recipe Roller Commit-Queue: Andrii Shyshkalov Reviewed-by: Andrii Shyshkalov --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++---------- .../full.expected/add_blamelists.json | 2 +- .../add_blamelists_bot_update_failure.json | 2 +- .../examples/full.expected/basic.json | 2 +- .../basic_with_branch_heads.json | 2 +- .../full.expected/bot_update_failure.json | 2 +- .../full.expected/no_cp_checkout_HEAD.json | 2 +- .../no_cp_checkout_a_specific_commit.json | 4 +- .../full.expected/no_cp_checkout_master.json | 6 +-- .../examples/full.expected/origin_master.json | 2 +- .../resolve_chromium_fixed_version.json | 2 +- ...sion_fallback_chain_set_output_commit.json | 2 +- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index e27e1159f..05893e502 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1", + "revision": "f4c9a77634665e42da92a9d7005ec920a3e38c9e", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index a174d6f6f..143bf772d 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/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b64b15afdf9f3fe3b6bf8e662c4795b9c0e902e1/recipe_engine/recipe_api.py#875 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/f4c9a77634665e42da92a9d7005ec920a3e38c9e/recipe_engine/recipe_api.py#875 diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json index 999d55ad6..80422dbec 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json @@ -19,7 +19,7 @@ "--revision", "src/v8@HEAD", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json index 3b361a6f5..b9cafc777 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json @@ -19,7 +19,7 @@ "--revision", "src/v8@HEAD", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json index fadaea83f..e7487db56 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json @@ -17,7 +17,7 @@ "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json index 87063c034..0cb708617 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json @@ -17,7 +17,7 @@ "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", - "refs/heads/master", + "refs/heads/main", "--with_branch_heads", "--disable-syntax-validation" ], diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json index 2d54d88aa..4480eb5d4 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json @@ -17,7 +17,7 @@ "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json index 4aa86dfed..37f574871 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json @@ -17,7 +17,7 @@ "--revision", "src@HEAD", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json index 58d603c45..5faab3b76 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json @@ -17,7 +17,7 @@ "--revision", "src@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { @@ -55,7 +55,7 @@ "cmd": [], "name": "set_output_gitiles_commit", "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"chromium.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"chromium/src\", \"ref\": \"refs/heads/master\"}@@@" + "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"chromium.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"chromium/src\", \"ref\": \"refs/heads/main\"}@@@" ] }, { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json index 8c53942f1..c54a570cd 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json @@ -15,9 +15,9 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@refs/heads/master", + "src@refs/heads/main", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { @@ -55,7 +55,7 @@ "cmd": [], "name": "set_output_gitiles_commit", "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"chromium.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"chromium/src\", \"ref\": \"refs/heads/master\"}@@@" + "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"chromium.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"chromium/src\", \"ref\": \"refs/heads/main\"}@@@" ] }, { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json b/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json index 124757762..490c7cc34 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json @@ -17,7 +17,7 @@ "--revision", "src@origin/master", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json index fadaea83f..e7487db56 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json @@ -17,7 +17,7 @@ "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json index 44f24ccd3..1074762a0 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json @@ -15,7 +15,7 @@ "--output_json", "/path/to/tmp/json", "--refs", - "refs/heads/master", + "refs/heads/main", "--disable-syntax-validation" ], "env": {