feat: separate --release argument for SDP version

src/image_tools/args.py

@@ -15,6 +15,11 @@
     re.compile(r"0\.0\.0-dev(-.+)?"),
 ]
 
+DEFAULT_RELEASE_FORMATS = [
+    re.compile(r"[2-9][0-9]\.[1-9][0-2]?\.\d+(-rc\d+)?"),
+    re.compile(r"0\.0\.0-dev"),
+]
+
 
 def build_bake_argparser() -> ArgumentParser:
     parser = ArgumentParser(
@@ -36,6 +41,12 @@ def build_bake_argparser() -> ArgumentParser:
         default="0.0.0-dev",
         help="Image version. Default: 0.0.0-dev.",
     )
+    parser.add_argument(
+        "--release",
+        type=check_release_format,
+        default="0.0.0-dev",
+        help="SDP release version. Default: 0.0.0-dev.",
+    )
     parser.add_argument(
         "-p",
         "--product",
@@ -164,6 +175,43 @@ def check_image_version_format(image_version) -> str:
     raise ValueError(f"Invalid image version: {image_version}")
 
 
+def check_release_format(release) -> str:
+    """
+        Check release against allowed formats.
+
+    >>> check_release_format("23.4.0")
+    '23.4.0'
+    >>> check_release_format("23.4.0-rc1")
+    '23.4.0-rc1'
+    >>> check_release_format("0.0.0-dev")
+    '0.0.0-dev'
+    >>> check_release_format("0.0.0-dev-kebab")
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+      File "<stdin>", line 5, in check_release_format
+    ValueError: Invalid release: 0.0.0-dev-kebab
+    >>> check_release_format("23.11.1-dev-kaese")
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+      File "<stdin>", line 5, in check_release_format
+    ValueError: Invalid release: 23.11.1-dev-kaese
+    >>> check_release_format("23.04.0")
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+      File "<stdin>", line 5, in check_release_format
+    ValueError: Invalid release: 23.04.0
+    >>> check_release_format("23.4.0.prerelease")
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+      File "<stdin>", line 5, in check_release_format
+    ValueError: Invalid release: 23.4.0.prerelease
+    """
+    for p in DEFAULT_RELEASE_FORMATS:
+        if p.fullmatch(release):
+            return release
+    raise ValueError(f"Invalid release: {release}")
+
+
 def check_build_arg(build_args: str) -> Tuple[str, str]:
     kv = build_args.split("=")
     if len(kv) != 2:
@@ -181,10 +229,17 @@ def preflight_args() -> Namespace:
     parser.add_argument(
         "-i",
         "--image-version",
-        help="Image version",
+        help="Image version. Default: 0.0.0-dev.",
         required=True,
         type=check_image_version_format,
     )
+
+    parser.add_argument(
+        "--release",
+        help="SDP release version. Default: 0.0.0-dev.",
+        required=True,
+        type=check_release_format,
+    )
     parser.add_argument("-p", "--product", help="Product to build images for", required=True)
     parser.add_argument("-s", "--submit", help="Submit results", action="store_true")
     parser.add_argument("-d", "--dry", help="Dry run.", action="store_true")

src/image_tools/bake.py

@@ -115,7 +115,7 @@ def bakefile_product_version_targets(
     """
     image_name = f"{args.registry}/{args.organization}/{product_name}"
     tags = build_image_tags(image_name, args.image_version, versions["product"])
-    build_args = build_image_args(versions, args.image_version)
+    build_args = build_image_args(versions, args.release)
     target_name = bakefile_target_name_for_product_version(product_name, versions["product"])
     rfc3339_date_time = datetime.now(timezone.utc).isoformat()
     revision = get_git_revision()