commit d0dfeae10362df75d2e170f987fd7940b8020fb2
author Brian Norris <briannorris@chromium.org> Thu Mar 09 13:06:47 2023 -0800
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Mar 29 00:36:02 2023 +0000
tree cf852951541bfb9f5129b95b10b9cae39e0d89c1
parent 4b985a3a8b0652037370134a0c2bee554b2624e4

api: Plumb Chroot.out_path into router/controller

We're not yet using this for anything, but let's get the API mechanics
in place.

BUG=b:265885353
TEST=./run_tests

Change-Id: Ieec3f8c4f74af99b3a043997c3fb9bad703fb7e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4327886
Commit-Queue: Brian Norris <briannorris@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

api/controller/controller_util.py

diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index 59bccd7..0cf3a59 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -51,6 +51,7 @@
     path = chroot_message.path or constants.DEFAULT_CHROOT_PATH
     cache_dir = chroot_message.cache_dir
     chrome_root = chroot_message.chrome_dir
+    out_path = chroot_message.out_path or constants.DEFAULT_OUT_PATH
 
     use_flags = [u.flag for u in chroot_message.env.use_flags]
     features = [f.feature for f in chroot_message.env.features]
@@ -67,7 +68,11 @@
         env["FEATURES"] = " ".join(features)
 
     chroot = chroot_lib.Chroot(
-        path=path, cache_dir=cache_dir, chrome_root=chrome_root, env=env
+        path=path,
+        out_path=out_path,
+        cache_dir=cache_dir,
+        chrome_root=chrome_root,
+        env=env,
     )
 
     return chroot
@@ -104,7 +109,7 @@
     )
 
 
-def ParseGomaConfig(goma_message, chroot_path):
+def ParseGomaConfig(goma_message, chroot_path, out_path):
     """Parse a goma config message."""
     assert isinstance(goma_message, common_pb2.GomaConfig)
 
@@ -136,6 +141,7 @@
         stage_name="BuildAPI",
         chromeos_goma_dir=chromeos_goma_dir,
         chroot_dir=chroot_path,
+        out_dir=out_path,
         goma_approach=goma_approach,
         stats_filename=stats_filename,
         counterz_filename=counterz_filename,