script/build-with-container: add more distro aliases

Add a system to define distro name aliases and use that to define some
additional aliases, primarily to match ubuntu codenames rather than
version numbers. Requested by Zack.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/script/build-with-container.py b/src/script/build-with-container.py
index 08e98833ae9904c06cf9b7d9aa6d7081e57553da..f00eb39ce82d0a7af60323408e7c05d74a83c752 100755 (executable)
--- a/src/script/build-with-container.py
+++ b/src/script/build-with-container.py
@@ -102,6 +102,28 @@ class DistroKind(StrEnum):
     def uses_dnf(cls):
         return {cls.CENTOS8, cls.CENTOS9, cls.CENTOS10, cls.FEDORA41}
 
+    @classmethod
+    def aliases(cls):
+        return {
+            str(cls.CENTOS10): cls.CENTOS10,
+            "centos10stream": cls.CENTOS10,
+            str(cls.CENTOS8): cls.CENTOS8,
+            str(cls.CENTOS9): cls.CENTOS9,
+            "centos9stream": cls.CENTOS9,
+            str(cls.FEDORA41): cls.FEDORA41,
+            "fc41": cls.FEDORA41,
+            str(cls.UBUNTU2204): cls.UBUNTU2204,
+            "ubuntu-jammy": cls.UBUNTU2204,
+            "jammy": cls.UBUNTU2204,
+            str(cls.UBUNTU2404): cls.UBUNTU2404,
+            "ubuntu-noble": cls.UBUNTU2404,
+            "noble": cls.UBUNTU2404,
+        }
+
+    @classmethod
+    def from_alias(cls, value):
+        return cls.aliases()[value]
+
 
 class DefaultImage(StrEnum):
     CENTOS10 = "quay.io/centos/centos:stream10"
@@ -636,7 +658,8 @@ def parse_cli(build_step_names):
     parser.add_argument(
         "--distro",
         "-d",
-        choices=[str(f) for f in DistroKind],
+        choices=DistroKind.aliases().keys(),
+        type=DistroKind.from_alias,
         default=str(DistroKind.CENTOS9),
         help="Specify a distro short name",
     )