From 68c71a34e1b1725396d01376f812be176f783ebc Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Mon, 3 May 2021 16:53:22 +0000 Subject: [PATCH] bot_update: Set DEPOT_TOOLS_REPORT_BUILD to report bot metrics. 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 Reviewed-by: Josip Sokcevic --- recipes/README.recipes.md | 10 +++++----- recipes/recipe_modules/bot_update/api.py | 6 ++++++ .../examples/full.expected/add_blamelists.json | 1 + .../add_blamelists_bot_update_failure.json | 1 + .../bot_update/examples/full.expected/basic.json | 1 + .../full.expected/basic_with_branch_heads.json | 1 + .../examples/full.expected/bot_update_failure.json | 1 + .../full.expected/deprecated_got_revision_mapping.json | 2 ++ .../full.expected/no_apply_patch_on_gclient.json | 2 ++ .../examples/full.expected/no_cp_checkout_HEAD.json | 1 + .../full.expected/no_cp_checkout_a_branch_head.json | 1 + .../no_cp_checkout_a_specific_commit.json | 1 + .../examples/full.expected/no_cp_checkout_master.json | 1 + .../examples/full.expected/origin_master.json | 1 + .../full.expected/resolve_chromium_fixed_version.json | 1 + .../revision_fallback_chain_set_output_commit.json | 1 + .../bot_update/examples/full.expected/tryjob_fail.json | 1 + .../examples/full.expected/tryjob_fail_patch.json | 1 + .../full.expected/tryjob_fail_patch_download.json | 1 + .../examples/full.expected/tryjob_gerrit_angle.json | 2 ++ .../full.expected/tryjob_gerrit_branch_heads.json | 2 ++ .../full.expected/tryjob_gerrit_feature_branch.json | 2 ++ .../full.expected/tryjob_gerrit_v8_feature_branch.json | 2 ++ .../examples/full.expected/tryjob_gerrit_webrtc.json | 2 ++ .../bot_update/examples/full.expected/tryjob_v8.json | 2 ++ .../full.expected/tryjob_v8_head_by_default.json | 2 ++ .../recipe_modules/bot_update/resources/bot_update.py | 2 -- 27 files changed, 44 insertions(+), 7 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 0d8fc2f2a..366482e14 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -58,12 +58,12 @@ Recipe module to ensure a checkout is consistent on a bot. Wrapper for easy calling of bot_update. -— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#530)(self, bot_update_step):** +— **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. -— **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):** +— **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. -— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#507)(self, project_name, gclient_config=None):** +— **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. -  **@property**
— **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#39)(self):** +  **@property**
— **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#45)(self):** -— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#458)(self, bot_update_json, name):** +— **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. diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index bc25ba167..eef7646f7 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -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) diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json index a2b346369..999d55ad6 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json index 6a234d3f3..3b361a6f5 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json index 5ca2353d9..fadaea83f 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json index c759f87d2..87063c034 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json index 0be756e6d..2d54d88aa 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json index 07aacc7d5..2a10c6c8c 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json index 4f6881440..0b6bcbe63 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json index b50d17d17..4aa86dfed 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json index 617866ffe..eec993e00 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json index b524e1584..58d603c45 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json index d2ae7240b..8c53942f1 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json b/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json index b647a9b63..124757762 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/origin_master.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json index 5ca2353d9..fadaea83f 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json index f46826ab6..44f24ccd3 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json index 5a0e59ee2..417215606 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json index 271c8b007..09f5540c4 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json index 596b8a613..7754d803b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json index 4f6881440..0b6bcbe63 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json index 67b5ae3a6..db9f25275 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json index aa85a3bcf..fd5508967 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json index 626c54f96..48b483fe2 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json index f7e2e80b0..ccd835a0f 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json index 96117d919..10cf03ceb 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json index 71d948fbc..2b4db672b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json @@ -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" }, diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 6b8eea83c..64f6b5280 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -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)