commit b9d810bc2aa045106e2c7b3442fd64f767916ae8
author Alex Klein <saklein@chromium.org> Mon Jul 01 12:38:02 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Mon Jul 15 23:42:50 2019 +0000
tree 5ab5baf9e7e2f4aa331a88e0955c0563b71735c1
parent 2073440c95faea05d23e73e85865e8f30267c987

BundleTastFiles: Refactor to service.

Also did a minor naming convention fix for one of the error classes,
and added an __eq__ method for the Sysroot class to make testing easier.
Fixed lints in commands_unittest.py.

BUG=chromium:954294
TEST=run_tests

Change-Id: Icfc5e37a1a32d2eed24cf888ed9eff5473220712
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1684257
Tested-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Auto-Submit: Alex Klein <saklein@chromium.org>

api/controller/artifacts.py

diff --git a/api/controller/artifacts.py b/api/controller/artifacts.py
index 6b49ba3..17551de 100644
--- a/api/controller/artifacts.py
+++ b/api/controller/artifacts.py
@@ -135,6 +135,7 @@
     output_proto.artifacts.add().path = archive
 
 
+@validate.require('output_dir')
 def BundleTastFiles(input_proto, output_proto):
   """Tar the tast files for a build target.
 
@@ -145,12 +146,26 @@
   target = input_proto.build_target.name
   output_dir = input_proto.output_dir
   build_root = constants.SOURCE_ROOT
-  cwd = os.path.join(build_root, 'chroot/build', target, 'build')
 
-  # Note that unlike the functions below, this returns the full path
-  # to the tarball.
-  # TODO(crbug.com/954294): Replace with a chromite/service implementation.
-  archive = commands.BuildTastBundleTarball(build_root, cwd, output_dir)
+  chroot = controller_util.ParseChroot(input_proto.chroot)
+  sysroot_path = input_proto.sysroot.path
+
+  # TODO(saklein) Cleanup legacy handling after it has been switched over.
+  if target:
+    # Legacy handling.
+    chroot.path = os.path.join(build_root, 'chroot')
+    sysroot_path = os.path.join('/build', target)
+
+  # New handling - chroot & sysroot based.
+  # TODO(saklein) Switch this to the require decorator when legacy is removed.
+  if not sysroot_path:
+    cros_build_lib.Die('sysroot.path is required.')
+
+  sysroot = sysroot_lib.Sysroot(sysroot_path)
+  if not sysroot.Exists(chroot):
+    cros_build_lib.Die('Sysroot must exist.')
+
+  archive = artifacts.BundleTastFiles(chroot, sysroot, output_dir)
 
   if archive is None:
     cros_build_lib.Die(