commit 3690a22c236669a145e29a233e59239745cfdce0
author Jae Hoon Kim <kimjae@chromium.org> Wed Sep 20 18:15:27 2023 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 20 20:00:18 2023 +0000
tree cca8519c7b89c80c07fde8712dae6b3ac3e26c63
parent 9e6e5a48b778b00d4ccf44f3e551574b89a4944c

scripts: Use bool parser + option change

Opt to generate reproducible images is:
disable-randomness -> [no-]reproducible-image

BUG=none
TEST=CQ & run_tests

Change-Id: I1dcf29e4848683fa4bb60d10d7ddad48944ca30e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4878671
Tested-by: Jae Hoon Kim <kimjae@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Jae Hoon Kim <kimjae@chromium.org>

scripts/cros_generate_dlc_artifacts.py

diff --git a/scripts/cros_generate_dlc_artifacts.py b/scripts/cros_generate_dlc_artifacts.py
index 6c74347..1817445 100644
--- a/scripts/cros_generate_dlc_artifacts.py
+++ b/scripts/cros_generate_dlc_artifacts.py
@@ -55,27 +55,29 @@
         help="The optional output directory to put metadata into",
     )
 
-    parser.add_argument(
+    parser.add_bool_argument(
         "--upload",
-        action="store_true",
-        help="Upload the DLC artifacts to google buckets",
+        default=False,
+        enabled_desc="Upload the DLC artifacts to google buckets",
+        disabled_desc="Do not upload the DLC artifacts to google buckets",
     )
     parser.add_argument(
         "--uri-path",
         type="gs_path",
         help="The override for DLC image URI, check dlc_lib for default",
     )
-    parser.add_argument(
+    parser.add_bool_argument(
         "--upload-dry-run",
-        action="store_true",
-        help="Dry run without actual upload",
+        default=False,
+        enabled_desc="Dry run without actual upload",
+        disabled_desc="Ignored",
     )
 
-    # Salt for randomness DLC image randomness.
-    parser.add_argument(
-        "--disable-randomness",
-        action="store_true",
-        help="To disable randomizing hashes when generating DLC images",
+    parser.add_bool_argument(
+        "--reproducible-image",
+        default=False,
+        enabled_desc="To generate reproducible DLC images",
+        disabled_desc="To generate randomized DLC images",
     )
 
     # DLC required fields.
@@ -192,10 +194,10 @@
             sysroot="",
             board=dlc_lib.MAGIC_BOARD,
             ebuild_params=params,
-            reproducible=opts.disable_randomness,
+            reproducible=opts.reproducible_image,
             license_file=opts.license,
         ).ExternalGenerateDLC(
-            tmpdir, _SHORT_SALT if opts.disable_randomness else None
+            tmpdir, _SHORT_SALT if opts.reproducible_image else None
         )
         logging.debug("Generated DLC artifacts: %s", artifacts.StringJSON())