build-configs: Build kselftest-slim

Add kselftest-slim builds everywhere we build kselftest. Signed-off-by: Mark Brown <[email protected]>
kernelci · Apr 13, 2023 · 9b17722 · 9b17722
1 parent 6ba1dba
commit 9b17722
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/config/core/build-configs-cip.yaml b/config/core/build-configs-cip.yaml
@@ -59,19 +59,21 @@ cip_variants_kselftest: &cip_variants_kselftest
       <<: *cip_architectures
       arm:
         base_defconfig: 'multi_v7_defconfig'
-        fragments: [kselftest]
+        fragments: [kselftest, kselftest-slim]
         extra_configs: ['allnoconfig']
       arm64:
         fragments: [kselftest, arm64-chromebook]
         extra_configs:
           - 'allnoconfig'
           - 'defconfig+arm64-chromebook+kselftest'
+          - 'defconfig+arm64-chromebook+kselftest-slim'
       x86_64:
         base_defconfig: 'x86_64_defconfig'
         fragments: [kselftest, x86-chromebook]
         extra_configs:
           - 'allnoconfig'
           - 'x86_64_defconfig+x86-chromebook+kselftest'
+          - 'x86_64_defconfig+x86-chromebook+kselftest-slim'
 
 
 cip_variants_preempt_rt: &cip_variants_preempt_rt

diff --git a/config/core/build-configs-stable.yaml b/config/core/build-configs-stable.yaml
@@ -70,18 +70,20 @@ stable_variants_kselftest: &stable_variants_kselftest
       arm:
         base_defconfig: 'multi_v7_defconfig'
         extra_configs: ['allnoconfig']
-        fragments: [kselftest]
+        fragments: [kselftest, kselftest-slim]
       arm64:
         extra_configs:
           - 'allnoconfig'
           - 'defconfig+arm64-chromebook+kselftest'
+          - 'defconfig+arm64-chromebook+kselftest-slim'
         fragments: [arm64-chromebook, kselftest]
       x86_64:
         base_defconfig: 'x86_64_defconfig'
         extra_configs:
           - 'allnoconfig'
           - 'x86_64_defconfig+x86-chromebook+kselftest'
-        fragments: [x86-chromebook, kselftest]
+          - 'x86_64_defconfig+x86-chromebook+kselftest-slim'
+        fragments: [x86-chromebook, kselftest, kselftest-slim]
 
 
 build_configs:

diff --git a/config/core/build-configs.yaml b/config/core/build-configs.yaml
@@ -425,6 +425,13 @@ fragments:
       - 'CONFIG_NET_IPGRE=m'
       - 'CONFIG_NET_IPGRE_DEMUX=m'
 
+  kselftest-slim:
+    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"
     configs:
@@ -712,6 +719,7 @@ build_configs_defaults:
       fragments: &default_fragments
         - 'debug'
         - 'kselftest'
+        - 'kselftest-slim'
         - 'tinyconfig'
 
       architectures: &default_architectures
@@ -749,6 +757,7 @@ build_configs_defaults:
             - '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]
 
@@ -778,6 +787,7 @@ build_configs_defaults:
             - '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]
 
@@ -1047,15 +1057,19 @@ build_configs:
           arm64: &arm64-kselftest
             <<: *arm64_defconfig
             fragments: [arm64-chromebook]
-            extra_configs: ['defconfig+kselftest+arm64-chromebook']
+            extra_configs: [
+                    'defconfig+kselftest+arm64-chromebook',
+                    'defconfig+kselftest-slim+arm64-chromebook']
             filters: *kselftest-only
           i386:
             <<: *i386_defconfig
             filters: *kselftest-only
           x86_64: &x86_64-kselftest
             <<: *x86_64_defconfig
             fragments: [x86-chromebook]
-            extra_configs: ['x86_64+defconfig+kselftest+x86-chromebook']
+            extra_configs: [
+                    'x86_64+defconfig+kselftest+x86-chromebook',
+                    'x86_64+defconfig+kselftest-slim+x86-chromebook']
             filters: *kselftest-only
       clang-16:
         build_environment: clang-16
@@ -1108,7 +1122,7 @@ build_configs:
         architectures: *arch_clang_configs
       rustc-1.62:
         build_environment: rustc-1.62
-        fragments: [rust, rust-samples, kselftest]
+        fragments: [rust, rust-samples, kselftest, kselftest-slim]
         architectures:
           x86_64:
             base_defconfig: 'x86_64_defconfig'
@@ -1168,6 +1182,7 @@ build_configs:
               - 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
               - 'defconfig+CONFIG_RANDOMIZE_BASE=y'
               - 'defconfig+arm64-chromebook+kselftest'
+              - 'defconfig+arm64-chromebook+kselftest-slim'
           arm:
             base_defconfig: 'multi_v7_defconfig'
             extra_configs:
@@ -1336,7 +1351,7 @@ build_configs:
     variants:
       rustc-1.66:
         build_environment: rustc-1.66
-        fragments: [rust, rust-for-linux-samples, kselftest]
+        fragments: [rust, rust-for-linux-samples, kselftest, kselftest-slim]
         architectures:
           x86_64:
             base_defconfig: 'x86_64_defconfig'
@@ -1347,7 +1362,7 @@ build_configs:
     variants:
       rustc-1.62:
         build_environment: rustc-1.62
-        fragments: [rust, rust-samples, kselftest]
+        fragments: [rust, rust-samples, kselftest, kselftest-slim]
         architectures:
           x86_64:
             base_defconfig: 'x86_64_defconfig'