Fix version checks for SL 16.0, introduce 16.1

Author: dirkmueller

.github/workflows/cleanup-staging.yml

@@ -20,6 +20,7 @@ jobs:
           - 6
           - 5
           - "16.0"
+          - "16.1"
           - Tumbleweed
 
     steps:

.github/workflows/obs_build.yml

@@ -16,6 +16,7 @@ jobs:
           - 7
           - 6
           - "16.0"
+          - "16.1"
           - Tumbleweed
 
     steps:

.github/workflows/update-cr-project.yml

@@ -21,6 +21,7 @@ jobs:
           - 7
           - 6
           - "16.0"
+          - "16.1"
           - Tumbleweed
 
     steps:

.github/workflows/update-deployment-branches.yml

@@ -28,6 +28,7 @@ jobs:
           - 7
           - 6
           - "16.0"
+          - "16.1"
           - Tumbleweed
 
     steps:

src/bci_build/os_version.py

@@ -20,6 +20,9 @@ class OsVersion(enum.Enum):
     SP3 = 3
     #: SUSE Linux 16.0
     SL16_0 = "16.0"
+    #: SUSE Linux 16.1
+    SL16_1 = "16.1"
+
     #: openSUSE Tumbleweed
     TUMBLEWEED = "Tumbleweed"
 
@@ -104,7 +107,7 @@ def is_sle15(self) -> bool:
 
     @property
     def is_sl16(self) -> bool:
-        return self.value in (OsVersion.SL16_0.value,)
+        return self.value in (OsVersion.SL16_0.value, OsVersion.SL16_1.value)
 
     @property
     def is_tumbleweed(self) -> bool:
@@ -124,6 +127,9 @@ def os_version(self) -> str:
             return f"15.{str(self.value)}"
         if self.value == OsVersion.SL16_0.value:
             return "16.0"
+        if self.value == OsVersion.SL16_1.value:
+            return "16.1"
+
         # Tumbleweed rolls too fast, just use latest
         return "latest"
 
@@ -135,15 +141,15 @@ def has_container_suseconnect(self) -> bool:
     def eula_package_names(self) -> tuple[str, ...]:
         if self.is_sle15:
             return ("skelcd-EULA-bci",)
-        if self.value == OsVersion.SL16_0.value:
+        if self.is_sl16:
             return ("skelcd-EULA-BCI",)
         return ()
 
     @property
     def release_package_names(self) -> tuple[str, ...]:
         if self.value == OsVersion.TUMBLEWEED.value:
             return ("openSUSE-release", "openSUSE-release-appliance-docker")
-        if self.value == OsVersion.SL16_0.value:
+        if self.is_sl16:
             return ("SLES-release",)
         if self.is_ltss:
             return ("sles-ltss-release",)
@@ -182,6 +188,7 @@ def libexecdir(self) -> str:
     OsVersion.SP7,
     OsVersion.TUMBLEWEED,
     OsVersion.SL16_0,
+    OsVersion.SL16_1,
 ]
 
 # List of SPs that are already under LTSS
@@ -208,4 +215,5 @@ def libexecdir(self) -> str:
     OsVersion.SP5: datetime.date(2024, 12, 31),
     OsVersion.SP6: datetime.date(2025, 12, 31),
     OsVersion.SP7: datetime.date(2031, 7, 31),
+    # OsVersion.SL16_0: datetime.date(2027, 12, 31),
 }

src/bci_build/package/basecontainers.py

@@ -402,9 +402,9 @@ def _get_minimal_kwargs(os_version: OsVersion):
 KERNEL_MODULE_CONTAINERS = []
 
 for os_version in ALL_OS_VERSIONS - {OsVersion.TUMBLEWEED}:
-    if os_version == OsVersion.SL16_0:
+    if os_version.is_sl16:
         prefix = "sle16"
-        pretty_prefix = "SLE 16"
+        pretty_prefix = "SLES 16"
     else:
         assert os_version.is_sle15
         prefix = "sle15"

src/bci_build/package/package_versions.json

@@ -1,67 +1,77 @@
 {
     "389-ds": {
         "16.0": "3.0",
+        "16.1": "3.0",
         "6": "2.2",
         "7": "2.5",
         "Tumbleweed": "3.1",
         "version_format": "minor"
     },
     "cosign": {
         "16.0": "2.5",
+        "16.1": "2.5",
         "6": "2.5",
         "7": "2.5",
         "Tumbleweed": "2.5",
         "version_format": "minor"
     },
     "distribution": {
         "16.0": "3.0",
+        "16.1": "3.0",
         "6": "2.8",
         "7": "2.8",
         "Tumbleweed": "3.0",
         "version_format": "minor"
     },
     "git": {
         "16.0": "2.46",
+        "16.1": "2.46",
         "6": "2.51",
         "7": "2.51",
         "Tumbleweed": "2.51",
         "version_format": "minor"
     },
     "helm": {
         "16.0": "3.18",
+        "16.1": "3.18",
         "6": "3.18",
         "7": "3.18",
         "Tumbleweed": "3.18",
         "version_format": "minor"
     },
     "kea": {
         "16.0": "3.0",
+        "16.1": "3.0",
         "7": "2.6",
         "Tumbleweed": "3.0",
         "version_format": "minor"
     },
     "mariadb": {
         "16.0": "11.8",
+        "16.1": "11.8",
         "6": "10.11",
         "7": "11.8",
         "Tumbleweed": "11.8",
         "version_format": "minor"
     },
     "nginx": {
         "16.0": "1.27",
+        "16.1": "1.27",
         "6": "1.21",
         "7": "1.21",
         "Tumbleweed": "1.29",
         "version_format": "minor"
     },
     "pcp": {
         "16.0": "6.2.0",
+        "16.1": "6.2.0",
         "6": "6.2.0",
         "7": "6.2.0",
         "Tumbleweed": "6.2.1"
     },
     "python-kiwi": {
         "16.0": "10.2",
+        "16.1": "10.2",
         "6": "9.24",
         "7": "9.24",
         "Tumbleweed": "10.2",
@@ -81,6 +91,7 @@
     },
     "valkey": {
         "16.0": "8.0",
+        "16.1": "8.0",
         "6": "8.0",
         "7": "8.0",
         "Tumbleweed": "8.1",

src/bci_build/package/versions.py

@@ -124,7 +124,8 @@ def get_pkg_version(pkg_name: str, os_version: OsVersion) -> str:
 
 #: projects from which to take package versions
 _OBS_PROJECTS: dict[OsVersion, str] = {
-    OsVersion.SL16_0: "SUSE:SLFO:Main:Build",
+    OsVersion.SL16_0: "SUSE:SLFO:1.2",
+    OsVersion.SL16_1: "SUSE:SLFO:Main:Build",
     OsVersion.TUMBLEWEED: "openSUSE:Factory",
 } | {OsVersion(ver): f"SUSE:SLE-15-SP{ver}:Update" for ver in range(3, 8)}