commit 1ec0c81e425b66f7c190998b00cc65a4940004a8
author Joanna Wang <jojwang@google.com> Wed Nov 17 17:41:27 2021 -0800
committer Commit Bot <commit-bot@chromium.org> Tue Nov 23 21:32:42 2021 +0000
tree 8bb47067b74487b1912cfaf2217af22675246abe
parent 49c6971902593bab279c52683f284f5ccaf7c272

Add plumbing to pass remoteexec info.

BUG=chromium:1256966
TEST=run_tests

Change-Id: I98b614cd0aab6fd2a84b649fa970a7112047580d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3290681
Tested-by: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index 440f7f5..479cc14 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -173,7 +173,8 @@
 
 
 def EnterChroot(chroot_path, cache_dir, chrome_root, chrome_root_mount,
-                goma_dir, goma_client_json, working_dir, additional_args):
+                goma_dir, goma_client_json, reclient_dir, reproxy_cfg_file,
+                working_dir, additional_args):
   """Enters an existing SDK chroot"""
   st = os.statvfs(os.path.join(chroot_path, 'usr', 'bin', 'sudo'))
   if st.f_flag & os.ST_NOSUID:
@@ -188,6 +189,10 @@
     cmd.extend(['--goma_dir', goma_dir])
   if goma_client_json:
     cmd.extend(['--goma_client_json', goma_client_json])
+  if reclient_dir:
+    cmd.extend(['--reclient_dir', reclient_dir])
+  if reproxy_cfg_file:
+    cmd.extend(['--reproxy_cfg_file', reproxy_cfg_file])
   if working_dir is not None:
     cmd.extend(['--working_dir', working_dir])
 
@@ -696,6 +701,14 @@
       type='path',
       help='Service account json file to use goma on bot. '
       'Mounted into the chroot.')
+  parser.add_argument(
+      '--reclient-dir',
+      type='path',
+      help='Reclient installed directory to mount into the chroot.')
+  parser.add_argument(
+      '--reproxy-cfg-file',
+      type='path',
+      help="Config file for re-client's reproxy used for remoteexec.")
 
   # Use type=str instead of type='path' to prevent the given path from being
   # transfered to absolute path automatically.
@@ -1172,6 +1185,7 @@
         cros_sdk_lib.MountChrootPaths(options.chroot)
       ret = EnterChroot(options.chroot, options.cache_dir, options.chrome_root,
                         options.chrome_root_mount, options.goma_dir,
-                        options.goma_client_json, options.working_dir,
+                        options.goma_client_json, options.reclient_dir,
+                        options.reproxy_cfg_file, options.working_dir,
                         chroot_command)
       sys.exit(ret.returncode)