From b2cd023ee2f3d4b6d5c0bef835227ad5b54e458d Mon Sep 17 00:00:00 2001
From: Brett Mastbergen <bmastbergen@ciq.com>
Date: Fri, 23 Jan 2026 11:07:14 -0500
Subject: [PATCH 1/3] [KK] Add 6.18

For now, its the same as 6.12
---
 kernel_kselftest.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel_kselftest.sh b/kernel_kselftest.sh
index 7946fed..51a3175 100755
--- a/kernel_kselftest.sh
+++ b/kernel_kselftest.sh
@@ -261,9 +261,10 @@ case $(uname -r) in
         SUDO_TARGETS="binderfs capabilities cgroup cpu-hotplug cpufreq efivars efivarfs firmware fpu gpio ipc intel_pstate ir kexec lib livepatch memfd memory-hotplug mptcp mqueue net netfilter sync sysctl timens timers vm x86 zram"
         SKIP_TARGETS="lkdtm proc"
         ;;
-    *6.12.*)
+    *6.12.*|\
+    *6.18.*)
         echo
-        echo "Running 6.12 kselftests"
+        echo "Running 6.12/6.18 kselftests"
         echo
         SUDO_TARGETS="binderfs capabilities cgroup clone3 cpu-hotplug cpufreq damon drivers/net efivars efivarfs exec firmware fpu gpio ipc intel_pstate ir kexec lib livepatch memfd memory-hotplug mptcp mqueue net netfilter sync sysctl timens timers vm x86 zram"
         SKIP_TARGETS="lkdtm"

From a3f49ca1d7f5c1d209f72b80ea1414f3698f5356 Mon Sep 17 00:00:00 2001
From: Brett Mastbergen <bmastbergen@ciq.com>
Date: Fri, 23 Jan 2026 11:08:05 -0500
Subject: [PATCH 2/3] [KK] Skip net/forwarding on 6.12/6.18

It takes > 2 hours alone, which can put an automated github workflow
over the max of 6 hours.
---
 kernel_kselftest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel_kselftest.sh b/kernel_kselftest.sh
index 51a3175..b8396c1 100755
--- a/kernel_kselftest.sh
+++ b/kernel_kselftest.sh
@@ -267,7 +267,7 @@ case $(uname -r) in
         echo "Running 6.12/6.18 kselftests"
         echo
         SUDO_TARGETS="binderfs capabilities cgroup clone3 cpu-hotplug cpufreq damon drivers/net efivars efivarfs exec firmware fpu gpio ipc intel_pstate ir kexec lib livepatch memfd memory-hotplug mptcp mqueue net netfilter sync sysctl timens timers vm x86 zram"
-        SKIP_TARGETS="lkdtm"
+        SKIP_TARGETS="lkdtm net/forwarding"
         ;;
     *)
         echo

From 5cc155546f76670fb6e7314f3fce6a6850becbe7 Mon Sep 17 00:00:00 2001
From: Brett Mastbergen <bmastbergen@ciq.com>
Date: Fri, 23 Jan 2026 12:11:58 -0500
Subject: [PATCH 3/3] [KK] Install jsonschema and pyyaml

Some networking tests have python scripts that use these libraries
---
 kernel_kselftest.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel_kselftest.sh b/kernel_kselftest.sh
index b8396c1..af49409 100755
--- a/kernel_kselftest.sh
+++ b/kernel_kselftest.sh
@@ -75,11 +75,13 @@ install_kselftest_deps_8() {
     kernel-selftests-internal
 
     pip3 install --user \
+    jsonschema \
     netaddr \
     packaging \
     pyftpdlib \
     pyparsing \
     pytest \
+    pyyaml \
     scapy \
     tftpy
 }
@@ -141,11 +143,13 @@ install_kselftest_deps_9() {
     wget
 
     pip3 install --user \
+    jsonschema \
     netaddr \
     packaging \
     pyftpdlib \
     pyparsing \
     pytest \
+    pyyaml \
     scapy \
     tftpy \
     wheel
@@ -205,11 +209,13 @@ install_kselftest_deps_10() {
     wget
 
     pip3 install --user \
+    jsonschema \
     netaddr \
     packaging \
     pyftpdlib \
     pyparsing \
     pytest \
+    pyyaml \
     scapy \
     tftpy \
     wheel