commit 41d2e02e8d1438445eee7463ae4536fe6280e0fc
author Yulan Lin <yulanlin@google.com> Tue Jun 07 22:35:15 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 08 08:17:38 2022 +0000
tree d334d9c4e93bb11f28460daf3b2e013e2b4a618c
parent bb205a6e5da95e2f85ae01ef1839806e872e009b

verified-builds: cleanup provenance archive

Functionally a revert of crrev/c/3386853

This work is now made obsolete by work to use
bcid_reporter, including crrev/c/3691141, because
the provenance format will be different (not in archive)
and uploaded per relevant artifact to GCS by Spike.

BUG=chromium:1274931
TEST=./run_tests --quick (one failure due to venv that seemed unrelated)

Change-Id: I797a72e06386f18132e7b2d0be60d18735c928e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3693175
Reviewed-by: George Engelbrecht <engeg@google.com>
Commit-Queue: Yulan Lin <yulanlin@google.com>
Tested-by: Yulan Lin <yulanlin@google.com>

scripts/pushimage_unittest.py

diff --git a/scripts/pushimage_unittest.py b/scripts/pushimage_unittest.py
index 9f49256..7c8ea2c 100644
--- a/scripts/pushimage_unittest.py
+++ b/scripts/pushimage_unittest.py
@@ -290,7 +290,7 @@
     with mock.patch.object(gs.GSContext, 'Exists', return_value=True):
       urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
                                  sign_types=['recovery'])
-    self.assertEqual(self.gs_mock.call_count, 36)
+    self.assertEqual(self.gs_mock.call_count, 34)
     self.assertTrue(self.mark_mock.called)
     self.assertEqual(urls, EXPECTED)
 
@@ -308,7 +308,7 @@
     with mock.patch.object(gs.GSContext, 'Exists', return_value=True):
       urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
                                  sign_types=['base'])
-    self.assertEqual(self.gs_mock.call_count, 38)
+    self.assertEqual(self.gs_mock.call_count, 36)
     self.assertTrue(self.mark_mock.called)
     self.assertEqual(urls, EXPECTED)
 
@@ -326,7 +326,7 @@
     with mock.patch.object(gs.GSContext, 'Exists', return_value=True):
       urls = pushimage.PushImage('/src', 'board2', 'R34-5126.0.0',
                                  sign_types=['gsc_firmware'])
-    self.assertEqual(self.gs_mock.call_count, 36)
+    self.assertEqual(self.gs_mock.call_count, 34)
     self.assertTrue(self.mark_mock.called)
     self.assertEqual(urls, EXPECTED)
 
@@ -334,7 +334,7 @@
     """Verify nothing is signed when we request an unavailable type"""
     urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
                                sign_types=['nononononono'])
-    self.assertEqual(self.gs_mock.call_count, 34)
+    self.assertEqual(self.gs_mock.call_count, 32)
     self.assertFalse(self.mark_mock.called)
     self.assertEqual(urls, {})