Commit 8f20428b authored by Edward Lesmes's avatar Edward Lesmes Committed by Commit Bot

Reland "bot_update: Patch on gclient by default."

This is a reland of e38cf570

The issue with win CQ bots was fixed in https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1036309
It was due to misconfigured git user.{name,email}

Original change's description:
> bot_update: Patch on gclient by default.
>
> See [4] for the design doc for this change.
>
> We're moving the patching logic from bot_update to gclient.
> This way we can test patches of dependencies that modify their DEPS
> files as well, for example when ANGLE uploads a patch that modifies
> DEPS files to be tested by a Chromium trybot.
>
> Chromium Linux CQ and Angle trybots are already running this way
> (see [1] and [2]) and a PSA has already been sent [3]
>
> [1] https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/cr-buildbucket.cfg#214
> [2] https://chromium.googlesource.com/angle/angle/+/infra/config/cr-buildbucket.cfg#105
> [3] https://groups.google.com/a/google.com/forum/#!topic/chrome-infra/FVHN2kdUX4I
> [4] https://docs.google.com/document/d/1GSTw4ysm5AYjNR6vMA7NJUxLK2VN9IpOEp_v0u-wyOE/edit?ts=5ad78165#
>
> Bug: 643346
> Change-Id: Ic9a9dcfae86aca730d35fbb26c26b21135e05bf3
> Recipe-Nontrivial-Roll: skia
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: skiabuildbot
> Recipe-Nontrivial-Roll: build
> Recipe-Nontrivial-Roll: release_scripts
> Reviewed-on: https://chromium-review.googlesource.com/1014356
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>

Bug: 643346
Change-Id: I4f4edd8e815cb12a4cbc3ab690eaf588bc2accc1
Reviewed-on: https://chromium-review.googlesource.com/1039966Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
parent 6c692edf
......@@ -15,7 +15,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
patch_gerrit_url, revision, parent_got_revision,
deps_revision_overrides, fail_patch, *args, **kwargs):
self._apply_patch_on_gclient = properties.get(
'apply_patch_on_gclient', False)
'apply_patch_on_gclient', True)
self._issue = patch_issue
self._patchset = patch_set
self._repository = repository or patch_repository_url
......@@ -207,8 +207,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
cmd.append('--gerrit_no_rebase_patch_ref')
if disable_syntax_validation or cfg.disable_syntax_validation:
cmd.append('--disable-syntax-validation')
if self._apply_patch_on_gclient:
cmd.append('--apply-patch-on-gclient')
if not self._apply_patch_on_gclient:
cmd.append('--no-apply-patch-on-gclient')
# Inject Json output for testing.
first_sln = cfg.solutions[0].name
......
......@@ -69,7 +69,7 @@
"--revision",
"src/third_party/angle@HEAD",
"--disable-syntax-validation",
"--apply-patch-on-gclient"
"--no-apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -170,7 +170,7 @@
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision",
"src/third_party/angle@fac9503c46405f77757b9a728eb85b8d7bc6080c",
"--apply-patch-on-gclient"
"--no-apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
......@@ -193,12 +193,12 @@ def GenTests(api):
patch_issue=338811,
patch_set=3,
)
yield api.test('apply_patch_on_gclient') + api.properties.tryserver(
yield api.test('no_apply_patch_on_gclient') + api.properties.tryserver(
gerrit_project='angle/angle',
patch_issue=338811,
patch_set=3,
) + api.bot_update.properties(
apply_patch_on_gclient=True,
apply_patch_on_gclient=False,
)
yield api.test('tryjob_gerrit_v8') + api.properties.tryserver(
gerrit_project='v8/v8',
......
......@@ -1053,7 +1053,9 @@ def parse_args():
parse.add_option(
'--disable-syntax-validation', action='store_true',
help='Disable validation of .gclient and DEPS syntax.')
parse.add_option('--apply-patch-on-gclient', action='store_true',
parse.add_option('--no-apply-patch-on-gclient',
dest='apply_patch_on_gclient', action='store_false',
default=True,
help='Patch the gerrit ref in gclient instead of here.')
options, args = parse.parse_args()
......
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