Skip to content

Commit 4daab4e

Browse files
authored
Merge pull request #1618 from SUSE/kiwi_16
Enable the kiwi container for 16.0
2 parents 613067d + 7101898 commit 4daab4e

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/bci_build/package/kiwi.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from bci_build.package import CAN_BE_LATEST_OS_VERSION
55
from bci_build.package import BuildType
66
from bci_build.package import DevelopmentContainer
7+
from bci_build.package import OsVersion
78
from bci_build.package import ParseVersion
89
from bci_build.package import generate_disk_size_constraints
910
from bci_build.package.helpers import generate_package_version_check
@@ -60,5 +61,5 @@
6061
"_constraints": generate_disk_size_constraints(8)
6162
},
6263
)
63-
for os_version in ALL_NONBASE_OS_VERSIONS
64+
for os_version in list(set(ALL_NONBASE_OS_VERSIONS) | set((OsVersion.SLE16_0,)))
6465
]

src/bci_build/package/package_versions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"Tumbleweed": "6.2.1"
2828
},
2929
"python-kiwi": {
30+
"16.0": "10.1.5",
3031
"5": "9.24.43",
3132
"6": "9.24.43",
3233
"7": "9.24.43",

src/bci_build/package/versions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ def get_pkg_version(pkg_name: str, os_version: OsVersion) -> str:
125125

126126
#: projects from which to take package versions
127127
_OBS_PROJECTS: dict[OsVersion, str] = {
128-
**{OsVersion(ver): f"SUSE:SLE-15-SP{ver}:Update" for ver in range(3, 8)},
129-
**{OsVersion.TUMBLEWEED: "openSUSE:Factory"},
130-
}
128+
OsVersion.SLE16_0: "SUSE:SLFO:Main:Build",
129+
OsVersion.TUMBLEWEED: "openSUSE:Factory",
130+
} | {OsVersion(ver): f"SUSE:SLE-15-SP{ver}:Update" for ver in range(3, 8)}
131131

132132

133133
@overload

0 commit comments

Comments
 (0)