Skip to content

C
Chromium_Depot_tools
Commit b2659abe authored by Yiwei Zhang's avatar Yiwei Zhang Committed by LUCI CQ
Browse files
Options

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 <iannucci@chromium.org>
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: 's avatarRobbie Iannucci <iannucci@chromium.org>
Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@google.com>
parent 4cbfb4b6
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 23 deletions
infra/config/recipes.cfg
View file @ b2659abe
......@@ -16,7 +16,7 @@
"deps": {
"recipe_engine": {
"branch": "master",
"revision": "fcd093f90d61d50fe815fa155ae68c7b204584d9",
"revision": "582276c5aa3d20e6a148948bb53be3eb14d62f3e",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
......
recipes/README.recipes.md
View file @ b2659abe
......@@ -1102,23 +1102,23 @@ Move things around in a loop!
&mdash; **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
recipes/recipe_modules/presubmit/api.py
View file @ b2659abe
......@@ -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([
......
recipes/recipe_modules/presubmit/tests/execute.py
View file @ b2659abe
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment