commit 7e05dbf6aa5ac8c8bf56e8a68140e3619b1bfe92
author Shuhei Takahashi <nya@chromium.org> Fri May 19 10:40:47 2023 +0900
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 22 02:30:28 2023 +0000
tree 49716f3f55498a2a1acc8a790b498ab9e19ea2e2
parent 589dc80545097b6145a1463d90943d7c28c88886

scripts: Copy special firmware archives only when requested to sign

Currently pushimage copies firmware_from_source.tar.bz2 to 5 different
locations. They're weird since they contents are identical while their
names suggest that contents are different (e.g. hps_firmware vs.
gsc_firmware).

This patch changes pushimage to copy specialized firmware archives only
when they are requested to sign. The assumption here is that firmware
archives are not useful without signing.

BUG=b:258256803
TEST=./run_tests

Change-Id: Iaee1b2aae731f4d1a5d99161d8670204a7f00232
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4546962
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Commit-Queue: Shuhei Takahashi <nya@chromium.org>

scripts/pushimage_unittest.py

diff --git a/scripts/pushimage_unittest.py b/scripts/pushimage_unittest.py
index d0e95c2..39cf72d 100644
--- a/scripts/pushimage_unittest.py
+++ b/scripts/pushimage_unittest.py
@@ -344,7 +344,7 @@
             urls = pushimage.PushImage(
                 "/src", "test.board", "R34-5126.0.0", sign_types=["recovery"]
             )
-        self.assertEqual(self.gs_mock.call_count, 34)
+        self.assertEqual(self.gs_mock.call_count, 26)
         self.assertTrue(self.mark_mock.called)
         self.assertEqual(urls, EXPECTED)
 
@@ -369,7 +369,7 @@
             urls = pushimage.PushImage(
                 "/src", "test.board", "R34-5126.0.0", sign_types=["base"]
             )
-        self.assertEqual(self.gs_mock.call_count, 36)
+        self.assertEqual(self.gs_mock.call_count, 28)
         self.assertTrue(self.mark_mock.called)
         self.assertEqual(urls, EXPECTED)
 
@@ -394,7 +394,7 @@
             urls = pushimage.PushImage(
                 "/src", "board2", "R34-5126.0.0", sign_types=["gsc_firmware"]
             )
-        self.assertEqual(self.gs_mock.call_count, 34)
+        self.assertEqual(self.gs_mock.call_count, 28)
         self.assertTrue(self.mark_mock.called)
         self.assertEqual(urls, EXPECTED)
 
@@ -403,7 +403,7 @@
         urls = pushimage.PushImage(
             "/src", "test.board", "R34-5126.0.0", sign_types=["nononononono"]
         )
-        self.assertEqual(self.gs_mock.call_count, 32)
+        self.assertEqual(self.gs_mock.call_count, 24)
         self.assertFalse(self.mark_mock.called)
         self.assertEqual(urls, {})