From f963ab92721d5cc81a7d9fd6b1e19c996478eac4 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Mon, 8 Jun 2026 11:29:34 -0500 Subject: [PATCH] feat(bakery): add UBI as an alias for RHEL in OS name resolution Allows bakery.yaml to use "UBI 10" as well as "RHEL 10" to select the rhel/10 OS entry, since UBI is Red Hat's freely-redistributable base image for RHEL 10. --- posit-bakery/posit_bakery/config/image/build_os.py | 1 + posit-bakery/test/config/image/test_version_os.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/posit-bakery/posit_bakery/config/image/build_os.py b/posit-bakery/posit_bakery/config/image/build_os.py index 78479330b..245ee44af 100644 --- a/posit-bakery/posit_bakery/config/image/build_os.py +++ b/posit-bakery/posit_bakery/config/image/build_os.py @@ -49,6 +49,7 @@ def packageVersionSeparator(self) -> str: "red hat": "rhel", "rh": "rhel", "el": "rhel", + "ubi": "rhel", "almalinux": "alma", "alma linux": "alma", "rockylinux": "rocky", diff --git a/posit-bakery/test/config/image/test_version_os.py b/posit-bakery/test/config/image/test_version_os.py index d9ba4e10b..4911a0ed4 100644 --- a/posit-bakery/test/config/image/test_version_os.py +++ b/posit-bakery/test/config/image/test_version_os.py @@ -140,6 +140,8 @@ def test_equality(self): ("RHEL", SUPPORTED_OS["rhel"]["10"]), ("RH 9", SUPPORTED_OS["rhel"]["9"]), ("EL8", SUPPORTED_OS["rhel"]["8"]), + ("UBI 10", SUPPORTED_OS["rhel"]["10"]), + ("UBI", SUPPORTED_OS["rhel"]["10"]), ("Alma 9", SUPPORTED_OS["alma"]["9"]), ("AlmaLinux 8", SUPPORTED_OS["alma"]["8"]), ("Alma Linux", SUPPORTED_OS["alma"]["10"]),