commit 1809b064e8bed72896bb236375f582492d54b523
author Mike Frysinger <vapier@chromium.org> Wed Jul 19 13:42:13 2023 -0400
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 31 15:29:13 2023 +0000
tree 7887a1d65c15913c93c8673b9ddcee3842529964
parent 3605bcb8451b1ad6c7d047d6090ac011d8c1d26d

scripts: deploy_chrome: run make_dev_ssd just once

This script accepts multiple partitions, so pass all of them once
rather invoking the script multiple times per partition.

BUG=b:289176310
TEST=CQ passes

Change-Id: Iab1950029c5101217a5f978007bd0d1def9b2d9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4822602
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index 4701481..4250c2a 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -234,12 +234,14 @@
         )
         # Running in VMs cause make_dev_ssd's firmware confidence checks to
         # fail. Use --force to bypass the checks.
-        cmd = (
-            "/usr/share/vboot/bin/make_dev_ssd.sh --partitions %d "
-            "--remove_rootfs_verification --force"
-        )
-        for partition in (KERNEL_A_PARTITION, KERNEL_B_PARTITION):
-            self.device.run(cmd % partition, check=False)
+        cmd = [
+            "/usr/share/vboot/bin/make_dev_ssd.sh",
+            "--partitions",
+            f"{KERNEL_A_PARTITION} {KERNEL_B_PARTITION}",
+            "--remove_rootfs_verification",
+            "--force",
+        ]
+        self.device.run(cmd, check=False)
 
         self.device.Reboot()