commit d1225eadf9733fa389f1415c057e4962870e9785
author Bob Haarman <inglorion@chromium.org> Wed Jan 19 22:01:42 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Tue Mar 08 15:29:40 2022 +0000
tree 1f946ff3b1a5fd3193c6ec135cdc51e3d18b7f5e
parent e28537f55f1ef2a336513fd94f5c1fd19dfbfe8e

Add BuildPrebuilts and UploadPrebuiltPackages for toolchain builder

BUG=b:196886631
TEST=Run a build with it

Change-Id: Icf88048850e4d334ca9a3f053e23b19cae9ba2dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3426428
Reviewed-by: Alex Klein <saklein@chromium.org>
Tested-by: Bob Haarman <inglorion@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Bob Haarman <inglorion@chromium.org>

scripts/upload_prebuilts_unittest.py

diff --git a/scripts/upload_prebuilts_unittest.py b/scripts/upload_prebuilts_unittest.py
index fc5d5b4..43939d8 100644
--- a/scripts/upload_prebuilts_unittest.py
+++ b/scripts/upload_prebuilts_unittest.py
@@ -342,12 +342,16 @@
     self.upload_mock = self.PatchObject(prebuilt.PrebuiltUploader,
                                         '_UploadPrebuilt', return_value=True)
 
-  def testSyncHostPrebuilts(self):
+  def _testSyncHostPrebuilts(self, chroot):
     board = 'x86-foo'
     target = prebuilt.BuildTarget(board, 'aura')
     slave_targets = [prebuilt.BuildTarget('x86-bar', 'aura')]
-    package_path = os.path.join(self.build_path,
-                                prebuilt._HOST_PACKAGES_PATH)
+    if chroot is None:
+      package_path = os.path.join(self.build_path,
+                                  'chroot',
+                                  prebuilt._HOST_PACKAGES_PATH)
+    else:
+      package_path = os.path.join(chroot, prebuilt._HOST_PACKAGES_PATH)
     url_suffix = prebuilt._REL_HOST_PATH % {
         'version': self.version,
         'host_arch': prebuilt._HOST_ARCH,
@@ -361,7 +365,7 @@
     uploader = prebuilt.PrebuiltUploader(
         self.upload_location, 'public-read', self.binhost, [],
         self.build_path, [], False, 'foo', False, target, slave_targets,
-        self.version)
+        self.version, chroot=chroot)
     uploader.SyncHostPrebuilts(self.key, True, True)
     self.upload_mock.assert_called_once_with(package_path, packages_url_suffix)
     self.rev_mock.assert_called_once_with(
@@ -369,6 +373,12 @@
     self.update_binhost_mock.assert_called_once_with(
         mock.ANY, self.key, binhost)
 
+  def testSyncHostPrebuilts(self):
+    self._testSyncHostPrebuilts(chroot=None)
+
+  def testSyncHostPrebuiltsWithChroot(self):
+    self._testSyncHostPrebuilts('/test/chroot')
+
   def testSyncBoardPrebuilts(self):
     board = 'x86-foo'
     target = prebuilt.BuildTarget(board, 'aura')
@@ -422,6 +432,7 @@
     options.profile = None
     target = prebuilt.BuildTarget(options.board, options.profile)
     options.build_path = '/trunk'
+    options.chroot = None
     options.dryrun = False
     options.private = True
     options.packages = []
@@ -464,7 +475,7 @@
                                       options.build_path, options.packages,
                                       False, None, False,
                                       target, options.slave_targets,
-                                      mock.ANY)
+                                      mock.ANY, None)
     board_mock.assert_called_once_with(
         options.key, options.git_sync,
         options.sync_binhost_conf, options.upload_board_tarball, None,