commit 2f7f0229857422925a5ce3f7f71d4079f8b7e443
author Yoshiki Iguchi <yoshiki@chromium.org> Wed May 17 19:30:09 2023 +0900
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 24 02:35:28 2023 +0000
tree 1a429217c1557409153544a29f6c5e457ebdd16f
parent 4bac3dab151caed869437ad4d1d8a9ba4fca074d

lib: sysroot_lib: Enable use of CQ binhosts with flag

This is a reland of enabling CQ prebuilts but it enables it only
with the flag.

The feature was once enabled but was reverted by crrev.com/c/4540304
and crrev.com/c/4535496, so that this CL makes the logic work only
when the flag is set.

Currently the flag is disabled for all builders, so that this CL
should not change any behavior.

BUG=b:283060147
TEST=./run_tests lib/sysroot_lib_unittest.py

Cq-Depend: chromium:4555076
Change-Id: I61d0c9feddb15d78c80895cb2b31d42f8ff81bf1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4542884
Reviewed-by: Cindy Lin <xcl@google.com>
Commit-Queue: Yoshiki Iguchi <yoshiki@chromium.org>
Tested-by: Yoshiki Iguchi <yoshiki@chromium.org>

api/controller/sysroot_unittest.py

diff --git a/api/controller/sysroot_unittest.py b/api/controller/sysroot_unittest.py
index 5f1a84f..2ce8f89 100644
--- a/api/controller/sysroot_unittest.py
+++ b/api/controller/sysroot_unittest.py
@@ -31,6 +31,7 @@
         profile=None,
         replace=False,
         current=False,
+        use_cq_prebuilts=False,
         package_indexes=None,
     ):
         """Helper to build and input proto instance."""
@@ -43,6 +44,8 @@
             proto.flags.replace = replace
         if current:
             proto.flags.chroot_current = current
+        if use_cq_prebuilts:
+            proto.flags.use_cq_prebuilts = use_cq_prebuilts
         if package_indexes:
             proto.package_indexes.extend(package_indexes)
 
@@ -126,11 +129,13 @@
         profile = None
         force = False
         upgrade_chroot = True
+        use_cq_prebuilts = False
         in_proto = self._InputProto(
             build_target=board,
             profile=profile,
             replace=force,
             current=not upgrade_chroot,
+            use_cq_prebuilts=use_cq_prebuilts,
         )
         out_proto = self._OutputProto()
         sysroot_controller.Create(in_proto, out_proto, self.api_config)
@@ -140,6 +145,7 @@
             force=force,
             upgrade_chroot=upgrade_chroot,
             package_indexes=[],
+            use_cq_prebuilts=use_cq_prebuilts,
             backtrack=sysroot_controller.DEFAULT_BACKTRACK,
         )
         self.assertEqual(board, out_proto.sysroot.build_target.name)
@@ -151,6 +157,7 @@
         profile = "profile"
         force = True
         upgrade_chroot = False
+        use_cq_prebuilts = True
         package_indexes = [
             common_pb2.PackageIndexInfo(
                 snapshot_sha="SHA",
@@ -173,6 +180,7 @@
             profile=profile,
             replace=force,
             current=not upgrade_chroot,
+            use_cq_prebuilts=use_cq_prebuilts,
             package_indexes=package_indexes,
         )
         out_proto = self._OutputProto()
@@ -186,6 +194,7 @@
                 for x in package_indexes
             ],
             upgrade_chroot=upgrade_chroot,
+            use_cq_prebuilts=use_cq_prebuilts,
             backtrack=sysroot_controller.DEFAULT_BACKTRACK,
         )
         self.assertEqual(board, out_proto.sysroot.build_target.name)
@@ -602,6 +611,7 @@
         build_target=None,
         sysroot_path=None,
         build_source=False,
+        use_cq_prebuilts=False,
         goma_dir=None,
         goma_log_dir=None,
         goma_stats_file=None,
@@ -618,6 +628,8 @@
             instance.sysroot.path = sysroot_path
         if build_source:
             instance.flags.build_source = build_source
+        if use_cq_prebuilts:
+            instance.flags.use_cq_prebuilts = use_cq_prebuilts
         if goma_dir:
             instance.goma_config.goma_dir = goma_dir
         if goma_log_dir: