test-configs.yaml: Use the kselftest-slim fragment by default for kselftest

The smaller kselftest-slim configs boot much more easily on
u-boot platforms which aren't able to automatically place images
so have fixed size regions they download binaries to so use them
as the default configuration for everything except cpufreq and
LKDTM which are not included in the slim configuration.

Signed-off-by: Mark Brown <[email protected]>

Author: broonie

config/core/build-configs.yaml

@@ -418,19 +418,16 @@ fragments:
       - 'CONFIG_IMA=y'
       - 'CONFIG_IMA_READ_POLICY=y'
 
-  kselftest:
+  kselftest: &kselftest-fragment
     path: "kernel/configs/kselftest.config"
     configs:
       - '# CONFIG_DUMMY is not set'
       - 'CONFIG_NET_IPGRE=m'
       - 'CONFIG_NET_IPGRE_DEMUX=m'
 
   kselftest-slim:
+    <<: *kselftest-fragment
     path: "kernel/configs/kselftest-slim.config"
-    configs:
-      - '# CONFIG_DUMMY is not set'
-      - 'CONFIG_NET_IPGRE=m'
-      - 'CONFIG_NET_IPGRE_DEMUX=m'
 
   preempt_rt:
     path: "kernel/configs/preempt_rt.config"
@@ -718,7 +715,6 @@ build_configs_defaults:
 
       fragments: &default_fragments
         - 'debug'
-        - 'kselftest'
         - 'kselftest-slim'
         - 'tinyconfig'
 
@@ -756,7 +752,6 @@ build_configs_defaults:
             - 'allnoconfig'
             - 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
             - 'defconfig+CONFIG_RANDOMIZE_BASE=y'
-            - 'defconfig+arm64-chromebook+kselftest'
             - 'defconfig+arm64-chromebook+kselftest-slim'
             - 'defconfig+arm64-chromebook+videodec'
           fragments: [arm64-chromebook, crypto, ima, videodec]
@@ -786,7 +781,6 @@ build_configs_defaults:
           extra_configs:
             - 'allmodconfig'
             - 'allnoconfig'
-            - 'x86_64_defconfig+x86-chromebook+kselftest'
             - 'x86_64_defconfig+x86-chromebook+kselftest-slim'
             - 'x86_64_defconfig+x86-chromebook+amdgpu'
           fragments: [amdgpu, crypto, ima, x86_kvm_guest, x86-chromebook]
@@ -1111,15 +1105,46 @@ build_configs:
     tree: mainline
     branch: 'master'
     variants:
-      gcc-10: *default_gcc-10
+      gcc-10:
+        <<: *default_gcc-10
+        fragments: &fragments-kselftest
+          - 'debug'
+          - 'kselftest'
+          - 'kselftest-slim'
+          - 'tinyconfig'
+
+        architectures:
+          <<: *default_architectures
+          arm64: &arm64_arch-kselftest
+            <<: *arm64_arch
+            extra_configs:
+              - 'allmodconfig'
+              - 'allnoconfig'
+              - 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
+              - 'defconfig+CONFIG_RANDOMIZE_BASE=y'
+              - 'defconfig+arm64-chromebook+kselftest'
+              - 'defconfig+arm64-chromebook+kselftest-slim'
+              - 'defconfig+arm64-chromebook+videodec'
+
+          x86_64: &x86_64_arch-kselftest
+            <<: *x86_64_arch
+            extra_configs:
+              - 'allmodconfig'
+              - 'allnoconfig'
+              - 'x86_64_defconfig+x86-chromebook+kselftest'
+              - 'x86_64_defconfig+x86-chromebook+kselftest-slim'
+              - 'x86_64_defconfig+x86-chromebook+amdgpu'
+
       # Minimum version
       clang-11:
         build_environment: clang-11
         architectures: *arch_clang_configs
+
       # Latest stable release
       clang-16:
         build_environment: clang-16
         architectures: *arch_clang_configs
+
       rustc-1.62:
         build_environment: rustc-1.62
         fragments: [rust, rust-samples, kselftest, kselftest-slim]
@@ -1164,14 +1189,14 @@ build_configs:
     variants:
       gcc-10:
         build_environment: gcc-10
-        fragments: *default_fragments
+        fragments: *fragments-kselftest
         architectures:
           i386: *i386_arch
-          x86_64: *x86_64_arch
+          x86_64: *x86_64_arch-kselftest
           mips: *mips_arch
           riscv: *riscv_arch
           sparc: *sparc_arch
-          arc: *arc_arch
+          arc:: *arc_arch
           arm64:
             <<: *arm64_arch
             extra_configs:
@@ -1183,6 +1208,8 @@ build_configs:
               - 'defconfig+CONFIG_RANDOMIZE_BASE=y'
               - 'defconfig+arm64-chromebook+kselftest'
               - 'defconfig+arm64-chromebook+kselftest-slim'
+              - 'kselftest'
+              - 'kselftest-slim'
           arm:
             base_defconfig: 'multi_v7_defconfig'
             extra_configs:
@@ -1192,6 +1219,8 @@ build_configs:
               - 'multi_v7_defconfig+CONFIG_THUMB2_KERNEL=y'
               - 'allnoconfig'
               - 'allmodconfig'
+              - 'kselftest'
+              - 'kselftest-slim'
 
       # Current development clang release
       clang-17:

config/core/test-configs.yaml

@@ -51,7 +51,7 @@ default_filters:
           - ['x86_64', 'x86_64_defconfig+x86-chromebook']
 
     - blocklist: &kselftest_defconfig_filter
-        defconfig: ['kselftest']
+        defconfig: ['kselftest', 'kselftest-slim']
 
   device_types:
 
@@ -233,15 +233,15 @@ test_plans:
     rootfs: debian_bullseye-kselftest_nfs
     pattern: 'kselftest/{category}-{method}-{protocol}-{rootfs}-kselftest-template.jinja2'
     filters:
-      - passlist: {defconfig: ['kselftest']}
+      - passlist: {defconfig: ['kselftest-slim']}
 
   # Add _a_ into the name so we can keep this before the individual
   # definitions
   kselftest_a_qemu: &kselftest_qemu
     rootfs: debian_bullseye-kselftest_ramdisk
     pattern: 'kselftest/{category}-{method}-{rootfs}-kselftest-template.jinja2'
     filters:
-      - passlist: {defconfig: ['kselftest']}
+      - passlist: {defconfig: ['kselftest-slim']}
 
   kselftest-alsa:
     <<: *kselftest
@@ -292,6 +292,9 @@ test_plans:
     params:
       job_timeout: '10'
       kselftest_collections: "cpufreq"
+    filters: &kselftest_full_fragment
+      - passlist: {defconfig: ['kselftest']}
+      - blocklist: {defconfig: ['kselftest-slim']}
 
   kselftest-exec:
     <<: *kselftest
@@ -351,6 +354,7 @@ test_plans:
     params:
       job_timeout: '10'
       kselftest_collections: "lkdtm"
+    filters: *kselftest_full_fragment
 
   kselftest-membarrier:
     <<: *kselftest