Ensure bot_update env has CHROME_HEADLESS=1

This setting ensures that bot_update/gclient will delete conflicting
directories instead of moving them to _bad_scm, which avoids wasting
disk space on bots.

Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: build_internal
Recipe-Nontrivial-Roll: chrome_release
Recipe-Nontrivial-Roll: chromiumos
Recipe-Nontrivial-Roll: infra
Bug: 462013257
Change-Id: I247427179205bf22bd24d142fa851d6628846a48
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7208105
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
This commit is contained in:
Gavin Mak
2025-12-03 13:09:02 -08:00
committed by LUCI CQ
parent de2b9aa7a6
commit 315ff3b4ec
38 changed files with 62 additions and 5 deletions

View File

@@ -65,12 +65,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#900)(self, bot_update_result):**
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#904)(self, bot_update_result):**
Deapplies a patch, taking care of DEPS and solution revisions properly.
&mdash; **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#386)(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, clobber=False, root_solution_revision=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, download_topics=False, recipe_revision_overrides=None, step_tags=None, clean_ignored=False, turboci_check_id: str='', \*\*kwargs):**
&mdash; **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#390)(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, clobber=False, root_solution_revision=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, download_topics=False, recipe_revision_overrides=None, step_tags=None, clean_ignored=False, turboci_check_id: str='', \*\*kwargs):**
Args:
* gclient_config: The gclient configuration to use when running bot_update.
@@ -113,7 +113,7 @@ Args:
if a non-empty value is provided and the gclient config doesn't have
exactly 1 solution.
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#877)(self, project_name, gclient_config=None):**
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#881)(self, project_name, gclient_config=None):**
Returns all property names used for storing the checked-out revision of
a given project.
@@ -129,12 +129,12 @@ Returns (list of str): All properties that'll hold the checked-out revision
&emsp; **@property**<br>&mdash; **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#294)(self):**
&mdash; **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#828)(self, bot_update_result, name):**
&mdash; **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#832)(self, bot_update_result, name):**
Sets a fixed revision for a single dependency using project revision
properties.
&mdash; **def [step\_name](/recipes/recipe_modules/bot_update/api.py#917)(self, patch, suffix):**
&mdash; **def [step\_name](/recipes/recipe_modules/bot_update/api.py#921)(self, patch, suffix):**
### *recipe_modules* / [depot\_tools](/recipes/recipe_modules/depot_tools)
[DEPS](/recipes/recipe_modules/depot_tools/__init__.py#6): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime]

View File

@@ -331,6 +331,10 @@ class BotUpdateApi(recipe_api.RecipeApi):
# bytes/second for GIT_HTTP_LOW_SPEED_TIME seconds then such request will be
# aborted. Otherwise, it would wait for global timeout to be reached.
env = {
# CHROME_HEADLESS makes it so we don't create gclient's _bad_scm dir
# and instead just remove/restart checkout from scratch.
'CHROME_HEADLESS':
'1',
'GIT_HTTP_LOW_SPEED_LIMIT':
'102400', # in bytes
'GIT_HTTP_LOW_SPEED_TIME':

View File

@@ -24,6 +24,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -24,6 +24,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -23,6 +23,7 @@
"--with_branch_heads"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -21,6 +21,7 @@
"--clobber"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -149,6 +150,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -184,6 +185,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -21,6 +21,7 @@
"--gerrit_no_rebase_patch_ref"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -149,6 +150,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -21,6 +21,7 @@
"--gerrit_no_reset"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -149,6 +150,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -20,6 +20,7 @@
"src@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -159,6 +160,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -24,6 +24,7 @@
"src@HEAD"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -152,6 +153,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/branch-heads/x"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"+refs/change/1/2/333"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -150,6 +151,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -20,6 +20,7 @@
"src@b0ff6a5b8b2bd8a31e9b5e29710da5275f0a9322"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -148,6 +149,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -20,6 +20,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -24,6 +24,7 @@
"refs/branch-heads/4000"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -22,6 +22,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"src/third_party/angle@refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -226,6 +227,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/branch-heads/67"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -223,6 +224,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/heads/experimental/feature"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -223,6 +224,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"src/v8@refs/heads/experimental/feature"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -226,6 +227,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"src/third_party/webrtc@refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -236,6 +237,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"src/v8@abc"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -226,6 +227,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"src/v8@refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -226,6 +227,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -81,6 +81,7 @@
"refs/heads/main"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -21,6 +21,7 @@
"--experiments=no_sync,cool_experiment"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -150,6 +151,7 @@
"--experiments=no_sync,cool_experiment"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",

View File

@@ -21,6 +21,7 @@
"--with_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",
@@ -149,6 +150,7 @@
"--no_fetch_tags"
],
"env": {
"CHROME_HEADLESS": "1",
"DEPOT_TOOLS_COLLECT_METRICS": "0",
"GIT_BACKENDINFO": "1",
"GIT_DAPPER_TRACE": "1",