Skip to content

C
Chromium_Depot_tools
Commit 355b11a3 authored by Edward Lesmes's avatar Edward Lesmes Committed by Commit Bot
Browse files
Options

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: 's avatarAaron Gable <agable@chromium.org>
parent 2c9a0460
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 49 deletions
recipes/recipe_modules/bot_update/api.py
View file @ 355b11a3
......@@ -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
......
recipes/recipe_modules/bot_update/examples/full.expected/basic.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@abc",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@abc",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_suffixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
View file @ 355b11a3
......@@ -19,7 +19,8 @@
"--revision",
"src@HEAD",
"--with_branch_heads",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -116,7 +117,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/buildbot.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@abc",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
View file @ 355b11a3
......@@ -19,7 +19,8 @@
"--revision",
"src@HEAD",
"--clobber",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -116,7 +117,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -83,7 +84,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
View file @ 355b11a3
......@@ -19,7 +19,8 @@
"--revision",
"src@HEAD",
"--gerrit_no_rebase_patch_ref",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -116,7 +117,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
View file @ 355b11a3
......@@ -19,7 +19,8 @@
"--revision",
"src@HEAD",
"--gerrit_no_reset",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -116,7 +117,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/no_shallow.json
View file @ 355b11a3
......@@ -19,7 +19,8 @@
"--revision",
"src@HEAD",
"--no_shallow",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -116,7 +117,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@revision",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -115,7 +116,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/trychange.json
View file @ 355b11a3
......@@ -20,7 +20,8 @@
"src@HEAD",
"--refs",
"+refs/change/1/2/333",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -117,7 +118,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -115,7 +116,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_empty_revision.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -115,7 +116,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
View file @ 355b11a3
......@@ -68,7 +68,8 @@
"src@HEAD",
"--revision",
"src/third_party/angle@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -168,7 +169,8 @@
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision",
"src/third_party/angle@fac9503c46405f77757b9a728eb85b8d7bc6080c"
"src/third_party/angle@fac9503c46405f77757b9a728eb85b8d7bc6080c",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle_deprecated.json
View file @ 355b11a3
......@@ -68,7 +68,8 @@
"src@HEAD",
"--revision",
"src/third_party/angle@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -168,7 +169,8 @@
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision",
"src/third_party/angle@fac9503c46405f77757b9a728eb85b8d7bc6080c"
"src/third_party/angle@fac9503c46405f77757b9a728eb85b8d7bc6080c",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
View file @ 355b11a3
......@@ -66,7 +66,8 @@
"/path/to/tmp/json",
"--revision",
"src@experimental/feature",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -163,7 +164,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8.json
View file @ 355b11a3
......@@ -68,7 +68,8 @@
"src@HEAD",
"--revision",
"src/v8@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -168,7 +169,8 @@
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision",
"src/v8@801ada225ddc271c132c3a35f03975671d43e399"
"src/v8@801ada225ddc271c132c3a35f03975671d43e399",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
View file @ 355b11a3
......@@ -68,7 +68,8 @@
"src@HEAD",
"--revision",
"src/v8@experimental/feature",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -168,7 +169,8 @@
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision",
"src/v8@801ada225ddc271c132c3a35f03975671d43e399"
"src/v8@801ada225ddc271c132c3a35f03975671d43e399",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
View file @ 355b11a3
......@@ -66,7 +66,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -163,7 +164,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
View file @ 355b11a3
......@@ -20,7 +20,8 @@
"src@HEAD",
"--revision",
"src/v8@abc",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -120,7 +121,8 @@
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision",
"src/v8@801ada225ddc271c132c3a35f03975671d43e399"
"src/v8@801ada225ddc271c132c3a35f03975671d43e399",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
View file @ 355b11a3
......@@ -68,7 +68,8 @@
"src@HEAD",
"--revision",
"src/v8@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -168,7 +169,8 @@
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision",
"src/v8@801ada225ddc271c132c3a35f03975671d43e399"
"src/v8@801ada225ddc271c132c3a35f03975671d43e399",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -115,7 +116,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name_no_patch.json
View file @ 355b11a3
......@@ -18,7 +18,8 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
View file @ 355b11a3
......@@ -19,7 +19,8 @@
"--revision",
"src@HEAD",
"--with_tags",
"--disable-syntax-validation"
"--disable-syntax-validation",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......@@ -116,7 +117,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
recipes/recipes/fetch_end_to_end_test.expected/basic.json
View file @ 355b11a3
......@@ -17,7 +17,8 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"depot_tools@HEAD"
"depot_tools@HEAD",
"--apply-patch-on-gclient"
],
"env_prefixes": {
"PATH": [
......
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