aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bot_update: Set DEPOT_TOOLS_REPORT_BUILD to report bot metrics.

Browse Source 
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Recipe-Nontrivial-Roll: chrome_release
Change-Id: I704ac523a3212ea30061948f8a9971a373d5394f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2861214
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
changes/14/2861214/7
Edward Lesmes 4 years ago committed by LUCI CQ
parent ad9487ab74
commit 68c71a34e1
27 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File

10
recipes/README.recipes.md
Unescape Escape View File

@ -58,12 +58,12 @@ Recipe module to ensure a checkout is consistent on a bot.
Wrapper for easy calling of bot_update.
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#530)(self, bot_update_step):**
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#536)(self, bot_update_step):**
Deapplies a patch, taking care of DEPS and solution revisions properly.
&mdash; **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#71)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, patch_oauth2=None, oauth2_json=None, use_site_config_creds=None, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, \*\*kwargs):**
&mdash; **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#77)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, patch_oauth2=None, oauth2_json=None, use_site_config_creds=None, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, \*\*kwargs):**
Args:
* gclient_config: The gclient configuration to use when running bot_update.
@ -95,7 +95,7 @@ Args:
bot_update module ONLY supports one change. Users may specify a change
via tryserver.set_change() and explicitly set this flag False.
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#507)(self, project_name, gclient_config=None):**
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#513)(self, project_name, gclient_config=None):**
Returns all property names used for storing the checked-out revision of
a given project.
@ -109,9 +109,9 @@ Args:
Returns (list of str): All properties that'll hold the checked-out revision
of the given project. An empty list if no such properties exist.
&emsp; **@property**<br>&mdash; **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#39)(self):**
&emsp; **@property**<br>&mdash; **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#45)(self):**
&mdash; **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#458)(self, bot_update_json, name):**
&mdash; **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#464)(self, bot_update_json, name):**
Sets a fixed revision for a single dependency using project revision
properties.

6
recipes/recipe_modules/bot_update/api.py
Unescape Escape View File

@ -32,6 +32,12 @@ class BotUpdateApi(recipe_api.RecipeApi):
'GIT_HTTP_LOW_SPEED_LIMIT': '102400', # in bytes
'GIT_HTTP_LOW_SPEED_TIME': 1800, # in seconds
}
if self.m.buildbucket.build.id != 0:
env['DEPOT_TOOLS_REPORT_BUILD'] = '%s/%s/%s/%s' % (
self.m.buildbucket.build.builder.project,
self.m.buildbucket.build.builder.bucket,
self.m.buildbucket.build.builder.builder,
self.m.buildbucket.build.id)
with self.m.context(env=env):
with self.m.depot_tools.on_path():
return self.m.python(name, bot_update_path, cmd, **kwargs)

1
recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json
Unescape Escape View File

@ -23,6 +23,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json
Unescape Escape View File

@ -23,6 +23,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/basic.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
Unescape Escape View File

@ -22,6 +22,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
Unescape Escape View File

@ -66,6 +66,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -139,6 +140,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -183,6 +184,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json
Unescape Escape View File

@ -21,6 +21,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json
Unescape Escape View File

@ -19,6 +19,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
Unescape Escape View File

@ -66,6 +66,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
Unescape Escape View File

@ -66,6 +66,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

1
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
Unescape Escape View File

@ -66,6 +66,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -183,6 +184,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -180,6 +181,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -180,6 +181,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -183,6 +184,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -193,6 +194,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -183,6 +184,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
Unescape Escape View File

@ -68,6 +68,7 @@
"--disable-syntax-validation"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},
@ -183,6 +184,7 @@
"--no_fetch_tags"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_HTTP_LOW_SPEED_LIMIT": "102400",
"GIT_HTTP_LOW_SPEED_TIME": "1800"
},

2
recipes/recipe_modules/bot_update/resources/bot_update.py
Unescape Escape View File

@ -366,8 +366,6 @@ def call_gclient(*args, **kwargs):
"""
cmd = [sys.executable, '-u', GCLIENT_PATH]
cmd.extend(args)
# Disable metrics collection on bots, since it's not supported anyway.
kwargs.setdefault('env', {})['DEPOT_TOOLS_METRICS'] = '0'
return call(*cmd, **kwargs)

Write Preview
Loading…
Cancel
Save