Skip to content

Commit

Permalink
Remove fetching of RBE cfg files.
Browse files Browse the repository at this point in the history
Remove fetching of RBE cfg files with CIPD. Instead rely on local cfg
files which use public docker images rather than private ones. Taken
from Chromium's trunk.

b/384982606
  • Loading branch information
briantting committed Jan 9, 2025
1 parent 14dd319 commit 781552a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
8 changes: 3 additions & 5 deletions build/toolchain/rbe.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ declare_args() {

# The directory where the re-client configuration files are.
rbe_cfg_dir = rebase_path("//buildtools/reclient_cfgs", root_build_dir)
cobalt_rbe_cfg_dir = rebase_path("//cobalt/reclient_cfgs", root_build_dir)
}

declare_args() {
# Set to the path of the RBE reclient configuration files.
# Configuration file selection based on operating system.
if (is_linux || is_android || is_chromeos || is_fuchsia) {
rbe_py_cfg_file = "${rbe_cfg_dir}/python/rewrapper_linux.cfg"
rbe_cc_cfg_file =
"${rbe_cfg_dir}/chromium-browser-clang/rewrapper_linux.cfg"
rbe_link_cfg_file =
"${rbe_cfg_dir}/chromium-browser-clang/rewrapper_linux_link.cfg"
rbe_py_cfg_file = "${cobalt_rbe_cfg_dir}/rewrapper_linux_py.cfg"
rbe_cc_cfg_file = "${cobalt_rbe_cfg_dir}/rewrapper_linux_cc.cfg"
} else if (is_win) {
rbe_py_cfg_file = "${rbe_cfg_dir}/python/rewrapper_windows.cfg"
rbe_cc_cfg_file =
Expand Down
5 changes: 3 additions & 2 deletions buildtools/reclient_cfgs/fetch_reclient_cfgs.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@ def main():
logging.error(
'--rbe_instance is required if --reproxy_cfg_template is set')
return 1
if not GenerateReproxyCfg(args.reproxy_cfg_template, args.rbe_instance):
return 1
if GenerateReproxyCfg(args.reproxy_cfg_template, args.rbe_instance):
return 0
return 1

if not args.rewrapper_cfg_project and not args.rbe_instance:
logging.error(
Expand Down
8 changes: 8 additions & 0 deletions cobalt/reclient_cfgs/rewrapper_linux_cc.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
server_address=unix:///tmp/reproxy.sock
labels=type=compile,compiler=clang,lang=cpp
exec_strategy=remote_local_fallback
dial_timeout=10m
exec_timeout=2m
reclient_timeout=2m
canonicalize_working_dir=true
8 changes: 8 additions & 0 deletions cobalt/reclient_cfgs/rewrapper_linux_py.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
server_address=unix:///tmp/reproxy.sock
labels=type=tool
exec_strategy=remote_local_fallback
dial_timeout=10m
canonicalize_working_dir=true
exec_timeout=2m
reclient_timeout=2m

0 comments on commit 781552a

Please sign in to comment.