From 5749ce1dd27f2784adca3dd6aeb656263ae65d02 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Fri, 14 Apr 2023 15:02:00 -0700 Subject: [PATCH] Roll recipe dependencies (nontrivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (depot_tools) into this repository. The build that created this CL was https://ci.chromium.org/b/8783803038271843633 Please review the expectation changes, and LGTM+CQ. depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/e718a914871f15761ff991b2b05e251d70afac00~..97dadd025f541f67af48417cc12ebdc00c1ad29c e718a91 (meiring@google.com) [ResultDB] Roll RDB CLI. 3ca8d0d (ukai@google.com) add siso wrapper 0418255 (bpastene@chromium.org) Don't put a timeout on 'CreateChange' gerrit rest calls 4a22431 (jojwang@google.com) Use shutil.copytree instead for migration script instead. 9a285c2 (sokcevic@chromium.org) Fix infra_to_superproject for Linux 97dadd0 (bpastene@chromium.org) Apply the gerrit REST timeout to only 'GetChanges' calls 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=denniskempin@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Ignore-Freeze: Autoroller Bugdroid-Send-Email: False Change-Id: I8409f8a06fffb8fc01665069eb86741246ec7d52 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4428224 Auto-Submit: Recipe Roller Reviewed-by: Dennis Kempin Commit-Queue: Dennis Kempin --- infra/README.recipes.md | 10 +++++----- infra/config/recipes.cfg | 2 +- .../prepare_source_for_try.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infra/README.recipes.md b/infra/README.recipes.md index 4a4173cb8b..a81b072067 100644 --- a/infra/README.recipes.md +++ b/infra/README.recipes.md @@ -186,11 +186,11 @@ PYTHON_VERSION_COMPATIBILITY: PY3 — **def [RunSteps](/infra/recipes/update_chromeos_merges.py#14)(api):** -[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/88f79dd119bffa65169f1a062f3f5a7155569c97/recipes/README.recipes.md#recipe_modules-bot_update -[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/88f79dd119bffa65169f1a062f3f5a7155569c97/recipes/README.recipes.md#recipe_modules-depot_tools -[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/88f79dd119bffa65169f1a062f3f5a7155569c97/recipes/README.recipes.md#recipe_modules-gclient -[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/88f79dd119bffa65169f1a062f3f5a7155569c97/recipes/README.recipes.md#recipe_modules-git -[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/88f79dd119bffa65169f1a062f3f5a7155569c97/recipes/README.recipes.md#recipe_modules-gsutil +[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/97dadd025f541f67af48417cc12ebdc00c1ad29c/recipes/README.recipes.md#recipe_modules-bot_update +[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/97dadd025f541f67af48417cc12ebdc00c1ad29c/recipes/README.recipes.md#recipe_modules-depot_tools +[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/97dadd025f541f67af48417cc12ebdc00c1ad29c/recipes/README.recipes.md#recipe_modules-gclient +[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/97dadd025f541f67af48417cc12ebdc00c1ad29c/recipes/README.recipes.md#recipe_modules-git +[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/97dadd025f541f67af48417cc12ebdc00c1ad29c/recipes/README.recipes.md#recipe_modules-gsutil [recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/56bdc99272708843d66abe27fd02d0e212b67811/README.recipes.md#recipe_modules-buildbucket [recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/56bdc99272708843d66abe27fd02d0e212b67811/README.recipes.md#recipe_modules-cipd [recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/56bdc99272708843d66abe27fd02d0e212b67811/README.recipes.md#recipe_modules-context diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 4185f827a8..3a0d7588f5 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -20,7 +20,7 @@ "deps": { "depot_tools": { "branch": "refs/heads/main", - "revision": "88f79dd119bffa65169f1a062f3f5a7155569c97", + "revision": "97dadd025f541f67af48417cc12ebdc00c1ad29c", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "recipe_engine": { diff --git a/infra/recipe_modules/crosvm/examples/source_context.expected/prepare_source_for_try.json b/infra/recipe_modules/crosvm/examples/source_context.expected/prepare_source_for_try.json index b6d7842ba6..9bb9b724ff 100644 --- a/infra/recipe_modules/crosvm/examples/source_context.expected/prepare_source_for_try.json +++ b/infra/recipe_modules/crosvm/examples/source_context.expected/prepare_source_for_try.json @@ -203,7 +203,7 @@ } }, "name": "Prepare source.gerrit fetch current CL info", - "timeout": 360, + "timeout": 480, "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_LOG_LINE@json.output@[@@@",