commit e08e3baa37c793db4b01b3dfb6bbaa976a1199c1
author Ram Chandrasekar <rchandrasekar@google.com> Mon Apr 04 21:42:27 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Apr 20 04:33:56 2022 +0000
tree 06eb73d863ef0def3aee50ed02dcdf4002c200a5
parent ac1b4f2e198192abb8fd59badcb624d196b91327

goma_lib: Move goma interface to chromite lib

Move goma interface from cbuildbot to goma_lib in chromite lib.

BUG=b:227807575
TEST=run_tests

Change-Id: Ic3b9ed0be70470b0f7fb34cd34ea734f10165091
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3578290
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Ram Chandrasekar <rchandrasekar@google.com>
Tested-by: Ram Chandrasekar <rchandrasekar@google.com>
Auto-Submit: Ram Chandrasekar <rchandrasekar@google.com>

api/controller/controller_util.py

diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index ee50969..07acbb0 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -11,11 +11,11 @@
 
 from chromite.api.gen.chromite.api import sysroot_pb2, test_pb2
 from chromite.api.gen.chromiumos import common_pb2
-from chromite.cbuildbot import goma_util
 from chromite.lib import build_target_lib
 from chromite.lib import constants
 from chromite.lib.parser import package_info
 from chromite.lib import chroot_lib
+from chromite.lib import goma_lib
 from chromite.lib import remoteexec_util
 from chromite.lib import sysroot_lib
 
@@ -107,26 +107,27 @@
   # Parse the goma config.
   chromeos_goma_dir = goma_message.chromeos_goma_dir or None
   if goma_message.goma_approach == common_pb2.GomaConfig.RBE_STAGING:
-    goma_approach = goma_util.GomaApproach('?staging',
-                                           'staging-goma.chromium.org', True)
+    goma_approach = goma_lib.GomaApproach('?staging',
+                                          'staging-goma.chromium.org', True)
   elif goma_message.goma_approach == common_pb2.GomaConfig.RBE_PROD:
-    goma_approach = goma_util.GomaApproach('?prod', 'goma.chromium.org', True)
+    goma_approach = goma_lib.GomaApproach('?prod', 'goma.chromium.org', True)
   else:
-    goma_approach = goma_util.GomaApproach('?cros', 'goma.chromium.org', True)
+    goma_approach = goma_lib.GomaApproach('?cros', 'goma.chromium.org', True)
 
   # Note that we are not specifying the goma log_dir so that goma will create
   # and use a tmp dir for the logs.
   stats_filename = goma_message.stats_file or None
   counterz_filename = goma_message.counterz_file or None
 
-  return goma_util.Goma(goma_message.goma_dir,
-                        goma_message.goma_client_json,
-                        stage_name='BuildAPI',
-                        chromeos_goma_dir=chromeos_goma_dir,
-                        chroot_dir=chroot_path,
-                        goma_approach=goma_approach,
-                        stats_filename=stats_filename,
-                        counterz_filename=counterz_filename)
+  return goma_lib.Goma(
+      goma_message.goma_dir,
+      goma_message.goma_client_json,
+      stage_name='BuildAPI',
+      chromeos_goma_dir=chromeos_goma_dir,
+      chroot_dir=chroot_path,
+      goma_approach=goma_approach,
+      stats_filename=stats_filename,
+      counterz_filename=counterz_filename)
 
 
 def ParseBuildTarget(