0

Disable depsscan service for windows developers due to cmd.exe env bug

Change-Id: I865722dbbd10f291e29e9f62d83e257673d2aff1
Bug: b/278871789
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4523285
Commit-Queue: Junji Watanabe <jwata@google.com>
Auto-Submit: Ben Segall <bentekkie@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#1142986}
This commit is contained in:
Ben Segall
2023-05-11 23:52:59 +00:00
committed by Chromium LUCI CQ
parent b1bb38f2fa
commit 3469ba5f9b
2 changed files with 9 additions and 5 deletions
buildtools/reclient_cfgs

@ -78,14 +78,18 @@ def GenerateReproxyCfg(reproxy_cfg_template, rbe_instance):
return False
with open(tmpl_path) as f:
reproxy_cfg_tmpl = string.Template(REPROXY_CFG_HEADER+f.read())
scandeps_bin_name = 'scandeps_server'
depsscanner_address = 'exec://' + os.path.join(CHROMIUM_SRC,
'buildtools',
'reclient',
'scandeps_server')
if sys.platform.startswith('win'):
scandeps_bin_name += ".exe"
# TODO(b/278871789) re-enable when reproxy version is > 105
# depsscanner_address += ".exe"
depsscanner_address = ""
reproxy_cfg = reproxy_cfg_tmpl.substitute({
'rbe_instance': rbe_instance,
'reproxy_cfg_template': reproxy_cfg_template,
'scandeps_bin_path':
os.path.join(CHROMIUM_SRC, 'buildtools', 'reclient', scandeps_bin_name),
'depsscanner_address': depsscanner_address,
})
reproxy_cfg_path = os.path.join(THIS_DIR, 'reproxy.cfg')
with open(reproxy_cfg_path, 'w') as f:

@ -9,7 +9,7 @@ deps_cache_max_mb=256
# enable_deps_cache=true
use_unified_uploads=true
fast_log_collection=true
depsscanner_address=exec://${scandeps_bin_path}
depsscanner_address=$depsscanner_address
# Improve upload/download concurrency
max_concurrent_streams_per_conn=50