From b2659abe19f10cb9dadc7bfa5ad1624de898630d Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 22 Mar 2021 21:08:38 +0000 Subject: [PATCH] recipe: Adopt the breaking change in cq recipe_module cq changes: https://crrev.com/c/2773637 R=tandrii Bug: 1177864 Recipe-Manual-Change: build Recipe-Manual-Change: build_limited_scripts_slave Change-Id: Ic89a2cd6c53bc69050dca4b1e3da8560a5f37dea Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2776469 Commit-Queue: Robbie Iannucci Auto-Submit: Yiwei Zhang Reviewed-by: Robbie Iannucci Reviewed-by: Andrii Shyshkalov --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++---------- recipes/recipe_modules/presubmit/api.py | 2 +- .../recipe_modules/presubmit/tests/execute.py | 3 +- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 07da785aa..1cb1d7a3b 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "fcd093f90d61d50fe815fa155ae68c7b204584d9", + "revision": "582276c5aa3d20e6a148948bb53be3eb14d62f3e", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index fa0a8bf8c..84400d477 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/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fcd093f90d61d50fe815fa155ae68c7b204584d9/recipe_engine/recipe_api.py#875 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/582276c5aa3d20e6a148948bb53be3eb14d62f3e/recipe_engine/recipe_api.py#875 diff --git a/recipes/recipe_modules/presubmit/api.py b/recipes/recipe_modules/presubmit/api.py index 6f780c122..d1ea2fd4b 100644 --- a/recipes/recipe_modules/presubmit/api.py +++ b/recipes/recipe_modules/presubmit/api.py @@ -102,7 +102,7 @@ class PresubmitApi(recipe_api.RecipeApi): '--gerrit_branch', self.m.tryserver.gerrit_change_target_ref, '--gerrit_fetch', ] - if self.m.cq.state == self.m.cq.DRY: + if self.m.cq.active and self.m.cq.run_mode == self.m.cq.DRY_RUN: presubmit_args.append('--dry_run') presubmit_args.extend([ diff --git a/recipes/recipe_modules/presubmit/tests/execute.py b/recipes/recipe_modules/presubmit/tests/execute.py index eb902355f..d65a61012 100644 --- a/recipes/recipe_modules/presubmit/tests/execute.py +++ b/recipes/recipe_modules/presubmit/tests/execute.py @@ -41,7 +41,8 @@ def GenTests(api): api.post_process(post_process.DropExpectation)) yield (api.test('cq_dry_run') + api.runtime(is_experimental=False) + - api.buildbucket.try_build(project='infra') + api.cq(dry_run=True) + + api.buildbucket.try_build(project='infra') + + api.cq(run_mode=api.cq.DRY_RUN) + api.post_process(post_process.StatusSuccess) + api.post_process( post_process.StepCommandContains, 'presubmit', ['--dry_run']) + api.post_process(post_process.DropExpectation))