From 95e3c066e858314508b28f1723edf6061cde241e Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 29 Jul 2026 08:59:00 +0200 Subject: [PATCH 1/2] USHIFT-7408: Use conditional dep for kernel-modules-extra to support kernel-rt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RHEL 10 moved iptables compat kernel modules (nft_compat, xt_CT) from kernel-modules-core to kernel-modules-extra. Use conditional rich dependencies so that each variant is gated on its own kernel-core package — installing MicroShift on a kernel-rt system does not pull in the regular kernel (and vice-versa). Co-Authored-By: Claude Opus 4.6 (1M context) pre-commit.check-secrets: ENABLED --- packaging/rpm/microshift.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 960d5769f7..31af6c2b63 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -84,8 +84,11 @@ Requires: iptables # and kubelet until OVN-K completes its nftables migration (OCPBUGS-98161). # The dependency is unconditional because the RPM is built on el9 (where # %{rhel} is 9) but cross-installed on el10, so conditionals do not work. +# Each variant is conditioned on its kernel-core so that installing MicroShift +# on a kernel-rt system does not pull in the regular kernel (and vice-versa). # On RHEL 9 this is a no-op as the modules are already in kernel-modules-core. -Requires: kernel-modules-extra +Requires: (kernel-modules-extra if kernel-core) +Requires: (kernel-rt-modules-extra if kernel-rt-core) Requires: microshift-selinux = %{version} Requires: microshift-networking = %{version} Requires: microshift-greenboot = %{version} From 0f8740e59096cb1d9e64ba3d4251cd0ffd253789 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 29 Jul 2026 08:59:09 +0200 Subject: [PATCH 2/2] USHIFT-7408: Re-enable tuned blueprint and low-latency scenario Re-enable the tuned ostree blueprint and the low-latency presubmit scenario that were disabled due to the missing kernel-rt package. Co-Authored-By: Claude Opus 4.6 (1M context) pre-commit.check-secrets: ENABLED --- ...rhel98-source-tuned.toml.disabled => rhel98-source-tuned.toml} | 0 .../{el98-src@low-latency.sh.disabled => el98-src@low-latency.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/image-blueprints/layer2-presubmit/group1/{rhel98-source-tuned.toml.disabled => rhel98-source-tuned.toml} (100%) rename test/scenarios/presubmits/{el98-src@low-latency.sh.disabled => el98-src@low-latency.sh} (100%) diff --git a/test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml.disabled b/test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml similarity index 100% rename from test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml.disabled rename to test/image-blueprints/layer2-presubmit/group1/rhel98-source-tuned.toml diff --git a/test/scenarios/presubmits/el98-src@low-latency.sh.disabled b/test/scenarios/presubmits/el98-src@low-latency.sh similarity index 100% rename from test/scenarios/presubmits/el98-src@low-latency.sh.disabled rename to test/scenarios/presubmits/el98-src@low-latency.sh