0

Revert "reclient_cfgs: add download_remoteexec_cfg flag"

This reverts commit 657cb7ae24.

Reason for revert: This breaks builders that manually call this script as it changes the default from downloading to not downloading cfg files

e.g. https://ci.chromium.org/ui/p/angle/builders/ci/android-pixel4-perf/4863/overview

Original change's description:
> reclient_cfgs: add download_remoteexec_cfg flag
>
> This is to generate reproxy.cfg for every user unconditionally.
> But this avoids reclient_cfgs download if user don't set
> `download_remoteexec_cfg` gclient var.
>
> Bug: b/291868532
> Change-Id: I26f136583dc8e4531b67684d398fc74378458fe6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4812381
> Reviewed-by: Junji Watanabe <jwata@google.com>
> Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1189345}

Bug: b/291868532
Change-Id: Idfa84e0cffde3054bf2ee2dbdb3a127b3012a5b8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4823366
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Auto-Submit: Ben Segall <bentekkie@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1189540}
This commit is contained in:
Ben Segall
2023-08-29 15:48:24 +00:00
committed by Chromium LUCI CQ
parent 07915412ca
commit e2ad2e99dc
2 changed files with 1 additions and 23 deletions
DEPS
buildtools/reclient_cfgs

18
DEPS

@ -5693,26 +5693,10 @@ hooks = [
'-d', 'src/third_party/blink/renderer/core/css/perftest_data'],
},
# Configure remote exec cfg files
{
'name': 'download_and_configure_reclient_cfgs',
'pattern': '.',
'condition': 'download_remoteexec_cfg',
'action': ['python3',
'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py',
'--rbe_instance',
Var('rbe_instance'),
'--reproxy_cfg_template',
'reproxy.cfg.template',
'--rewrapper_cfg_project',
Var('rewrapper_cfg_project'),
'--download_remoteexec_cfg',
'--quiet',
],
},
{
'name': 'configure_reclient_cfgs',
'pattern': '.',
'condition': 'not download_remoteexec_cfg',
'condition': 'download_remoteexec_cfg',
'action': ['python3',
'src/buildtools/reclient_cfgs/configure_reclient_cfgs.py',
'--rbe_instance',

@ -151,9 +151,6 @@ def main():
parser.add_argument('--cipd_prefix',
help='cipd package name prefix',
default='infra_internal/rbe/reclient_cfgs')
parser.add_argument('--download_remoteexec_cfg',
help='download reclient cfgs from CIPD server',
action='store_true')
parser.add_argument(
'--quiet',
help='Suppresses info logs',
@ -183,9 +180,6 @@ def main():
args.reproxy_cfg_template, args.rbe_instance, rbe_project):
return 1
if not args.download_remoteexec_cfg:
return 0
logging.info('fetch reclient_cfgs for RBE project %s...' % rbe_project)
cipd_prefix = posixpath.join(args.cipd_prefix, rbe_project)