Skip to content

Commit 3cdea6c

Browse files
dirkmuellerdirkmueller
authored
Merge pull request #3671 from SUSE/package-version-nvidia
Remove hardcoded package version from NVIDIA image
2 parents ac0bf3f + 84eab6f commit 3cdea6c

5 files changed

Lines changed: 561 additions & 192 deletions

File tree

‎src/bci_build/package/nvidia.py‎

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from bci_build.package.thirdparty import ThirdPartyPackage
2828
from bci_build.package.thirdparty import ThirdPartyRepo
2929
from bci_build.package.thirdparty import ThirdPartyRepoMixin
30+
from bci_build.package.versions import get_all_pkg_version
3031
from bci_build.repomdparser import RpmPackage
3132

3233
NVIDIA_REPOS = {
@@ -698,41 +699,9 @@ def _get_packages(os_version: OsVersion):
698699

699700
def _get_kernel_versions(variant: str, os_version: OsVersion):
700701
"""Return all kernel versions for a given kernel variant."""
701-
702-
# TODO: This should be moved to the package_versions.json
703-
# otherwise a new kernel version needs to be added here
704-
# for every release.
705-
# Azure is not currently included becuase the kABI is not
706-
# stable, and it would require a container for each version.
707-
if os_version == OsVersion.SL16_0:
708-
if variant in ["default", "64kb"]:
709-
return [
710-
"6.12.0-160000.27",
711-
"6.12.0-160000.26",
712-
"6.12.0-160000.9",
713-
"6.12.0-160000.8",
714-
"6.12.0-160000.7",
715-
"6.12.0-160000.6",
716-
"6.12.0-160000.5", # GA
717-
]
718-
719-
if os_version == OsVersion.SP7:
720-
if variant in ["default", "64kb"]:
721-
return [
722-
"6.4.0-150700.53.34",
723-
"6.4.0-150700.53.31",
724-
"6.4.0-150700.53.28",
725-
"6.4.0-150700.53.25",
726-
"6.4.0-150700.53.22",
727-
"6.4.0-150700.53.19",
728-
"6.4.0-150700.53.16",
729-
"6.4.0-150700.53.11",
730-
"6.4.0-150700.53.6",
731-
"6.4.0-150700.53.3",
732-
"6.4.0-150700.51", # GA
733-
]
734-
735-
raise ValueError(f"Unknown kernel versions for '{variant}' on '{os_version}'")
702+
versions = get_all_pkg_version(f"kernel-{variant}", os_version)
703+
versions.reverse()
704+
return versions
736705

737706

738707
# we need to support all versions supported by the gpu operator

‎src/bci_build/package/package_versions.json‎

Lines changed: 160 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,204 @@
11
{
22
"389-ds": {
3-
"16.0": "3.0",
4-
"16.1": "3.1",
5-
"6": "2.2",
6-
"7": "2.7",
7-
"Tumbleweed": "3.1",
3+
"latest": {
4+
"16.0": "3.0",
5+
"16.1": "3.1",
6+
"6": "2.2",
7+
"7": "2.7",
8+
"Tumbleweed": "3.1"
9+
},
810
"version_format": "minor"
911
},
1012
"containerized-data-importer": {
11-
"16.0": "1.64.0",
12-
"Tumbleweed": "1.64.0"
13+
"latest": {
14+
"16.0": "1.64.0",
15+
"Tumbleweed": "1.64.0"
16+
},
17+
"version_format": "patch"
1318
},
1419
"cosign": {
15-
"16.0": "3.0",
16-
"16.1": "3.0",
17-
"6": "3.0",
18-
"7": "3.0",
19-
"Tumbleweed": "3.0",
20+
"latest": {
21+
"16.0": "3.0",
22+
"16.1": "3.0",
23+
"6": "3.0",
24+
"7": "3.0",
25+
"Tumbleweed": "3.0"
26+
},
2027
"version_format": "minor"
2128
},
2229
"distribution": {
23-
"16.0": "3.0",
24-
"16.1": "3.0",
25-
"6": "2.8",
26-
"7": "2.8",
27-
"Tumbleweed": "3.0",
30+
"latest": {
31+
"16.0": "3.0",
32+
"16.1": "3.0",
33+
"6": "2.8",
34+
"7": "2.8",
35+
"Tumbleweed": "3.0"
36+
},
2837
"version_format": "minor"
2938
},
3039
"git": {
31-
"16.0": "2.51",
32-
"16.1": "2.53",
33-
"6": "2.51",
34-
"7": "2.51",
35-
"Tumbleweed": "2.53",
40+
"latest": {
41+
"16.0": "2.51",
42+
"16.1": "2.53",
43+
"6": "2.51",
44+
"7": "2.51",
45+
"Tumbleweed": "2.53"
46+
},
3647
"version_format": "minor"
3748
},
3849
"helm": {
39-
"16.0": "3.19",
40-
"16.1": "4.1",
41-
"6": "3.19",
42-
"7": "3.19",
43-
"Tumbleweed": "4.1",
50+
"latest": {
51+
"16.0": "3.19",
52+
"16.1": "4.1",
53+
"6": "3.19",
54+
"7": "3.19",
55+
"Tumbleweed": "4.1"
56+
},
4457
"version_format": "minor"
4558
},
4659
"kea": {
47-
"16.0": "3.0",
48-
"16.1": "3.0",
49-
"7": "2.6",
50-
"Tumbleweed": "3.0",
60+
"latest": {
61+
"16.0": "3.0",
62+
"16.1": "3.0",
63+
"7": "2.6",
64+
"Tumbleweed": "3.0"
65+
},
5166
"version_format": "minor"
5267
},
68+
"kernel-64kb": {
69+
"latest": {
70+
"16.0": "6.12.0-160000.27",
71+
"7": "6.4.0-150700.53.34"
72+
},
73+
"package_arch": "aarch64",
74+
"release_history": {
75+
"16.0": [
76+
"6.12.0-160000.5",
77+
"6.12.0-160000.6",
78+
"6.12.0-160000.7",
79+
"6.12.0-160000.8",
80+
"6.12.0-160000.9",
81+
"6.12.0-160000.26",
82+
"6.12.0-160000.27"
83+
],
84+
"7": [
85+
"6.4.0-150700.51",
86+
"6.4.0-150700.53.3",
87+
"6.4.0-150700.53.6",
88+
"6.4.0-150700.53.11",
89+
"6.4.0-150700.53.16",
90+
"6.4.0-150700.53.19",
91+
"6.4.0-150700.53.22",
92+
"6.4.0-150700.53.25",
93+
"6.4.0-150700.53.28",
94+
"6.4.0-150700.53.31",
95+
"6.4.0-150700.53.34"
96+
]
97+
},
98+
"version_format": "release"
99+
},
100+
"kernel-default": {
101+
"latest": {
102+
"16.0": "6.12.0-160000.27",
103+
"7": "6.4.0-150700.53.34"
104+
},
105+
"release_history": {
106+
"16.0": [
107+
"6.12.0-160000.5",
108+
"6.12.0-160000.6",
109+
"6.12.0-160000.7",
110+
"6.12.0-160000.8",
111+
"6.12.0-160000.9",
112+
"6.12.0-160000.26",
113+
"6.12.0-160000.27"
114+
],
115+
"7": [
116+
"6.4.0-150700.51",
117+
"6.4.0-150700.53.3",
118+
"6.4.0-150700.53.6",
119+
"6.4.0-150700.53.11",
120+
"6.4.0-150700.53.16",
121+
"6.4.0-150700.53.19",
122+
"6.4.0-150700.53.22",
123+
"6.4.0-150700.53.25",
124+
"6.4.0-150700.53.28",
125+
"6.4.0-150700.53.31",
126+
"6.4.0-150700.53.34"
127+
]
128+
},
129+
"version_format": "release"
130+
},
53131
"kubevirt": {
54-
"16.0": "1.7.0",
55-
"Tumbleweed": "1.7.0"
132+
"latest": {
133+
"16.0": "1.7.0",
134+
"Tumbleweed": "1.7.0"
135+
},
136+
"version_format": "patch"
56137
},
57138
"mariadb": {
58-
"16.0": "11.8",
59-
"16.1": "11.8",
60-
"6": "10.11",
61-
"7": "11.8",
62-
"Tumbleweed": "11.8",
139+
"latest": {
140+
"16.0": "11.8",
141+
"16.1": "11.8",
142+
"6": "10.11",
143+
"7": "11.8",
144+
"Tumbleweed": "11.8"
145+
},
63146
"version_format": "minor"
64147
},
65148
"nginx": {
66-
"16.0": "1.27",
67-
"16.1": "1.27",
68-
"6": "1.21",
69-
"7": "1.21",
70-
"Tumbleweed": "1.29",
149+
"latest": {
150+
"16.0": "1.27",
151+
"16.1": "1.27",
152+
"6": "1.21",
153+
"7": "1.21",
154+
"Tumbleweed": "1.29"
155+
},
71156
"version_format": "minor"
72157
},
73158
"pcp": {
74-
"16.0": "6.2.0",
75-
"16.1": "6.2.0",
76-
"6": "6.2.0",
77-
"7": "6.2.0",
78-
"Tumbleweed": "6.2.1"
159+
"latest": {
160+
"16.0": "6.2.0",
161+
"16.1": "6.2.0",
162+
"6": "6.2.0",
163+
"7": "6.2.0",
164+
"Tumbleweed": "6.2.1"
165+
},
166+
"version_format": "patch"
79167
},
80168
"python-kiwi": {
81-
"16.0": "10.2",
82-
"16.1": "10.2",
83-
"6": "10.2",
84-
"7": "10.2",
85-
"Tumbleweed": "10.2",
169+
"latest": {
170+
"16.0": "10.2",
171+
"16.1": "10.2",
172+
"6": "10.2",
173+
"7": "10.2",
174+
"Tumbleweed": "10.2"
175+
},
86176
"version_format": "minor"
87177
},
88178
"samba": {
89-
"6": "4.19",
90-
"7": "4.21",
91-
"Tumbleweed": "4.23",
179+
"latest": {
180+
"6": "4.19",
181+
"7": "4.21",
182+
"Tumbleweed": "4.23"
183+
},
92184
"version_format": "minor"
93185
},
94186
"spack": {
95-
"6": "0.23",
96-
"7": "0.23",
97-
"Tumbleweed": "0.23",
187+
"latest": {
188+
"6": "0.23",
189+
"7": "0.23",
190+
"Tumbleweed": "0.23"
191+
},
98192
"version_format": "minor"
99193
},
100194
"valkey": {
101-
"16.0": "8.0",
102-
"16.1": "8.0",
103-
"6": "8.0",
104-
"7": "8.0",
105-
"Tumbleweed": "9.0",
195+
"latest": {
196+
"16.0": "8.0",
197+
"16.1": "8.0",
198+
"6": "8.0",
199+
"7": "8.0",
200+
"Tumbleweed": "9.0"
201+
},
106202
"version_format": "minor"
107203
}
108204
}

0 commit comments

Comments
 (0)