Merge pull request #3387 from SUSE/kernel_multiversion

dirkmueller · web-flow · commit 0664f062dc93 · 2026-01-29T13:43:31.000+01:00
Skip multiversion in kernel-module-devel container
diff --git a/src/bci_build/package/basecontainers.py b/src/bci_build/package/basecontainers.py
@@ -439,7 +439,7 @@ def _get_minimal_kwargs(os_version: OsVersion):
 
 KERNEL_MODULE_CONTAINERS = []
 
-for os_version in ALL_OS_VERSIONS - {OsVersion.TUMBLEWEED}:
+for os_version in set(ALL_BASE_OS_VERSIONS) - {OsVersion.TUMBLEWEED}:
     if os_version.is_sl16:
         prefix = "sle16"
         pretty_prefix = "SLES 16"
@@ -489,6 +489,7 @@ def _get_minimal_kwargs(os_version: OsVersion):
                 {DOCKERFILE_RUN} if zypper -n install mokutil; then zypper -n clean -a; fi
                 """
             )
+            + f"{DOCKERFILE_RUN} sed -i -e 's,multiversion =.*,multiversion = ,' /etc/zypp/zypp.conf\n"
             + f"{DOCKERFILE_RUN} {LOG_CLEAN}",
             extra_files={"_constraints": generate_disk_size_constraints(8)},
         )

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ def _get_minimal_kwargs(os_version: OsVersion):`
`439`	`439`
`440`	`440`	`KERNEL_MODULE_CONTAINERS = []`
`441`	`441`
`442`		`-for os_version in ALL_OS_VERSIONS - {OsVersion.TUMBLEWEED}:`
	`442`	`+for os_version in set(ALL_BASE_OS_VERSIONS) - {OsVersion.TUMBLEWEED}:`
`443`	`443`	`if os_version.is_sl16:`
`444`	`444`	`prefix = "sle16"`
`445`	`445`	`pretty_prefix = "SLES 16"`
`@@ -489,6 +489,7 @@ def _get_minimal_kwargs(os_version: OsVersion):`
`489`	`489`	`{DOCKERFILE_RUN} if zypper -n install mokutil; then zypper -n clean -a; fi`
`490`	`490`	`"""`
`491`	`491`	`)`
	`492`	`+ + f"{DOCKERFILE_RUN} sed -i -e 's,multiversion =.*,multiversion = ,' /etc/zypp/zypp.conf\n"`
`492`	`493`	`+ f"{DOCKERFILE_RUN} {LOG_CLEAN}",`
`493`	`494`	`extra_files={"_constraints": generate_disk_size_constraints(8)},`
`494`	`495`	`)`