From 830c8fadf839a0a20fc0bef99e8a50ed8cae6355 Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Thu, 14 Oct 2021 21:57:50 +0000 Subject: [PATCH] Remove verbose debug information from bot_update It's generaly not useful and makes it harder to understand bot_update logs. If we need to debug specific builders, we can set environment variables in the recipe itself. R=apolito@google.com Bug: 1255228 Change-Id: I18fc6ee8cb15b30bc3a4422ddd04979189bacf64 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3221250 Commit-Queue: Anthony Polito Reviewed-by: Anthony Polito --- .../bot_update/resources/bot_update.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 8ccb2112cb..a427f948eb 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -692,28 +692,15 @@ def _git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir, for ref in refs: populate_cmd.extend(['--ref', ref]) - env = {} - if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL: - # This is for performance investigation of `git fetch` in chromium/src. - env = { - 'GIT_TRACE': 'true', - 'GIT_TRACE_PERFORMANCE': 'true', - 'GIT_TRACE_CURL': 'true', - 'GIT_TRACE_CURL_NO_DATA': 'true', - 'GIT_REDACT_COOKIES': 'o,SSO,GSSO_UberProxy,__Secure-GSSO_UberProxy', - } - # Step 1: populate/refresh cache, if necessary. if enforce_fetch or not pin: - git(*populate_cmd, env=env) + git(*populate_cmd) # If cache still doesn't have required pin/refs, try again and fetch pin/refs # directly. if not _has_in_git_cache(pin, refs, git_cache_dir, url): for attempt in range(3): - with git_config_if_not_set( - 'http.extraheader', 'X-Return-Encrypted-Headers: all'): - git(*populate_cmd, env=env) + git(*populate_cmd) if _has_in_git_cache(pin, refs, git_cache_dir, url): break print('Some required refs/commits are still not present.')