From 1dae84802654ca12529cbdcdcc05371bb5d30542 Mon Sep 17 00:00:00 2001 From: Rob Mohr Date: Mon, 15 Apr 2024 22:21:25 +0000 Subject: [PATCH] Replace use of "cq" module with "cv" Bug: 333811087 Change-Id: I85b7d5c38defc03a580685654d43d204dbfa5231 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5454164 Auto-Submit: Rob Mohr Reviewed-by: Yiwei Zhang Commit-Queue: Yiwei Zhang --- recipes/README.recipes.md | 7 ++++--- recipes/recipe_modules/bot_update/__init__.py | 2 +- recipes/recipe_modules/bot_update/api.py | 2 +- .../bot_update/tests/do_not_retry_patch_failures_in_cq.py | 4 ++-- recipes/recipe_modules/presubmit/__init__.py | 2 +- recipes/recipe_modules/presubmit/api.py | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 9baef4c70b..c2fed069c0 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -51,7 +51,7 @@ ### *recipe_modules* / [bot\_update](/recipes/recipe_modules/bot_update) -[DEPS](/recipes/recipe_modules/bot_update/__init__.py#3): [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [gerrit](#recipe_modules-gerrit), [gitiles](#recipe_modules-gitiles), [gsutil](#recipe_modules-gsutil), [tryserver](#recipe_modules-tryserver), [recipe\_engine/archive][recipe_engine/recipe_modules/archive], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/commit\_position][recipe_engine/recipe_modules/commit_position], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cq][recipe_engine/recipe_modules/cq], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/milo][recipe_engine/recipe_modules/milo], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/recipes/recipe_modules/bot_update/__init__.py#3): [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [gerrit](#recipe_modules-gerrit), [gitiles](#recipe_modules-gitiles), [gsutil](#recipe_modules-gsutil), [tryserver](#recipe_modules-tryserver), [recipe\_engine/archive][recipe_engine/recipe_modules/archive], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/commit\_position][recipe_engine/recipe_modules/commit_position], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/led][recipe_engine/recipe_modules/led], [recipe\_engine/milo][recipe_engine/recipe_modules/milo], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step] Recipe module to ensure a checkout is consistent on a bot. @@ -784,7 +784,7 @@ Raises: — **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#55)(self):** ### *recipe_modules* / [presubmit](/recipes/recipe_modules/presubmit) -[DEPS](/recipes/recipe_modules/presubmit/__init__.py#13): [bot\_update](#recipe_modules-bot_update), [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [git](#recipe_modules-git), [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cq][recipe_engine/recipe_modules/cq], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/recipes/recipe_modules/presubmit/__init__.py#13): [bot\_update](#recipe_modules-bot_update), [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [git](#recipe_modules-git), [tryserver](#recipe_modules-tryserver), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step] #### **class [PresubmitApi](/recipes/recipe_modules/presubmit/api.py#16)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -1037,7 +1037,7 @@ Raises: — **def [RunSteps](/recipes/recipe_modules/bot_update/examples/full.py#27)(api):** ### *recipes* / [bot\_update:tests/do\_not\_retry\_patch\_failures\_in\_cq](/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py) -[DEPS](/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py#9): [bot\_update](#recipe_modules-bot_update), [gclient](#recipe_modules-gclient), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cq][recipe_engine/recipe_modules/cq], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py#9): [bot\_update](#recipe_modules-bot_update), [gclient](#recipe_modules-gclient), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cv][recipe_engine/recipe_modules/cv], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] — **def [RunSteps](/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py#19)(api):** @@ -1219,6 +1219,7 @@ Move things around in a loop! [recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/69f0cf6953cbbf0180122d5174d780217594b684/README.recipes.md#recipe_modules-commit_position [recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/69f0cf6953cbbf0180122d5174d780217594b684/README.recipes.md#recipe_modules-context [recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/69f0cf6953cbbf0180122d5174d780217594b684/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/cv]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/69f0cf6953cbbf0180122d5174d780217594b684/README.recipes.md#recipe_modules-cv [recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/69f0cf6953cbbf0180122d5174d780217594b684/README.recipes.md#recipe_modules-file [recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/69f0cf6953cbbf0180122d5174d780217594b684/README.recipes.md#recipe_modules-json [recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/69f0cf6953cbbf0180122d5174d780217594b684/README.recipes.md#recipe_modules-led diff --git a/recipes/recipe_modules/bot_update/__init__.py b/recipes/recipe_modules/bot_update/__init__.py index a8fdef3a1e..ebcf344daa 100644 --- a/recipes/recipe_modules/bot_update/__init__.py +++ b/recipes/recipe_modules/bot_update/__init__.py @@ -10,7 +10,7 @@ DEPS = [ 'recipe_engine/buildbucket', 'recipe_engine/context', 'recipe_engine/commit_position', - 'recipe_engine/cq', + 'recipe_engine/cv', 'recipe_engine/json', 'recipe_engine/led', 'recipe_engine/milo', diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index eb7fa66982..cc7f2aea77 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -411,7 +411,7 @@ class BotUpdateApi(recipe_api.RecipeApi): step_result.presentation.status = 'FAILURE' # This is actual patch failure. self.m.tryserver.set_patch_failure_tryjob_result() - self.m.cq.set_do_not_retry_build() + self.m.cv.set_do_not_retry_build() self._upload_traces() raise self.m.step.StepFailure( 'Patch failure: See patch error log attached to bot_update. ' diff --git a/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py b/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py index c52aae4077..bcc5b17758 100644 --- a/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py +++ b/recipes/recipe_modules/bot_update/tests/do_not_retry_patch_failures_in_cq.py @@ -10,7 +10,7 @@ DEPS = [ 'bot_update', 'gclient', 'recipe_engine/buildbucket', - 'recipe_engine/cq', + 'recipe_engine/cv', 'recipe_engine/properties', 'recipe_engine/step', ] @@ -27,7 +27,7 @@ def RunSteps(api): except api.step.StepFailure: api.step( name='cq will not retry this' - if api.cq.do_not_retry_build else 'will retry', + if api.cv.do_not_retry_build else 'will retry', cmd=None) diff --git a/recipes/recipe_modules/presubmit/__init__.py b/recipes/recipe_modules/presubmit/__init__.py index 949286b9d7..c1150c2ce9 100644 --- a/recipes/recipe_modules/presubmit/__init__.py +++ b/recipes/recipe_modules/presubmit/__init__.py @@ -17,7 +17,7 @@ DEPS = [ 'git', 'recipe_engine/buildbucket', 'recipe_engine/context', - 'recipe_engine/cq', + 'recipe_engine/cv', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/recipes/recipe_modules/presubmit/api.py b/recipes/recipe_modules/presubmit/api.py index a0242faa40..e393208c88 100644 --- a/recipes/recipe_modules/presubmit/api.py +++ b/recipes/recipe_modules/presubmit/api.py @@ -141,7 +141,7 @@ class PresubmitApi(recipe_api.RecipeApi): '--verbose' ]) - if self.m.cq.active and self.m.cq.run_mode == self.m.cq.DRY_RUN: + if self.m.cv.active and self.m.cv.run_mode == self.m.cv.DRY_RUN: presubmit_args.append('--dry_run') additionalArgs = ['--root', abs_root,'--commit']