commit 019109290b69be57b47b2e0cde3db2499d16edf5
author Michael Mortensen <mmortensen@google.com> Wed Jul 24 14:48:10 2019 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Jul 30 18:48:09 2019 +0000
tree 00bd4646041afe7bcbb2d021b5e0338d991d46ff
parent 3b361d1e128139d848a499a688556bf5b438fe70

Refactor service/lib to use artifacts.BundleImageZip

BUG=chromium:963208
TEST=manual, run_tests

Change-Id: Ide313bcb99ad97d4b8bd3fbd3e75615a388919d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1723825
Reviewed-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>

api/controller/artifacts.py

diff --git a/api/controller/artifacts.py b/api/controller/artifacts.py
index 239af7a..c35760c 100644
--- a/api/controller/artifacts.py
+++ b/api/controller/artifacts.py
@@ -43,6 +43,7 @@
   return image_dir
 
 
+@validate.require('build_target.name', 'output_dir')
 def BundleImageZip(input_proto, output_proto):
   """Bundle image.zip.
 
@@ -53,7 +54,7 @@
   target = input_proto.build_target.name
   output_dir = input_proto.output_dir
   image_dir = _GetImageDir(constants.SOURCE_ROOT, target)
-  archive = commands.BuildImageZip(output_dir, image_dir)
+  archive = artifacts.BundleImageZip(output_dir, image_dir)
   output_proto.artifacts.add().path = os.path.join(output_dir, archive)