Skip to content

Commit 844f7e4

Browse files
author
CKI KWF Bot
committed
Merge: redhat: generalize rule for kunit and test kmod placement
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/832 JIRA: https://issues.redhat.com/browse/RHEL-89085 Upstream Status: RHEL only commit 26c113533f49b2a1706def8385f17af49533cdd6 Author: Jan Stancek <jstancek@redhat.com> Date: Mon Jan 27 02:24:42 2025 -0500 redhat: generalize rule for kunit and test kmod placement Signed-off-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Approved-by: Julio Faracco <jfaracco@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents faf9c27 + 7b84471 commit 844f7e4

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

redhat/rhel_files/def_variants.yaml.rhel

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ packages:
1818
- modules
1919

2020
rules:
21+
- .*kunit.*: modules-internal
22+
exact_pkg: True
23+
- .*test[^/]*.ko: modules-internal
24+
2125
- arch/.*: modules-core
2226
- block/t10-pi.ko: modules-core
2327
- crypto/.*: modules-core
@@ -28,7 +32,6 @@ rules:
2832
- drivers/acpi/.*: modules-core
2933
- drivers/ata/.*: modules-core
3034

31-
- drivers/base/.*(kunit|test).*: modules-internal
3235
- drivers/base/regmap/regmap-sdw.*: modules
3336
- drivers/base/.*: modules-core
3437
- drivers/block/floppy.*: modules-extra
@@ -40,7 +43,6 @@ rules:
4043
- drivers/cdx/.*: modules-core
4144
- drivers/char/mwave.*: modules
4245
- drivers/char/.*: modules-core
43-
- drivers/clk/.*(test|kunit).*: modules-internal
4446
- drivers/clk/.*: modules-core
4547
- drivers/counter/.*: modules-core
4648
- drivers/cpufreq/amd-pstate-ut.ko: modules-internal
@@ -56,7 +58,6 @@ rules:
5658
- drivers/dax/.*: modules-core
5759
- drivers/dca/.*: modules-core
5860
- drivers/devfreq/.*: modules-core
59-
- drivers/dma/dmatest.*: modules-internal
6061
- drivers/dma/.*: modules-core
6162

6263
- drivers/edac/.*: modules-core
@@ -82,7 +83,6 @@ rules:
8283
- drivers/gpu/drm/qxl/.*: modules-core
8384
- drivers/gpu/drm/scheduler/.*: modules-core
8485
- drivers/gpu/drm/solomon/.*: modules-core
85-
- drivers/gpu/drm/tests/.*: modules-internal
8686
- drivers/gpu/drm/tidss/.*: modules-core
8787
- drivers/gpu/drm/tiny/.*: modules-core
8888
- drivers/gpu/drm/ttm/.*: modules-core
@@ -95,7 +95,6 @@ rules:
9595
- drivers/gpu/drm/xlnx/.*: modules-core
9696
- drivers/gpu/host1x/.*: modules-core
9797

98-
- drivers/hid/.*test.*: modules-internal
9998
- drivers/hid/hid-asus.*: modules
10099
- drivers/hid/hid-nintendo.*: modules
101100
- drivers/hid/hid-picolcd.*: modules
@@ -120,15 +119,12 @@ rules:
120119
- drivers/i2c/.*: modules-core
121120
- drivers/i3c/.*: modules-core
122121
- drivers/iio/adc/dln2-adc.*: modules-extra
123-
- drivers/iio/test/.*: modules-internal
124122
- drivers/input/gameport/.*: modules
125123
- drivers/input/joystick/.*: modules-extra
126124
- drivers/input/tablet/.*: modules
127-
- drivers/input/tests/.*: modules-internal
128125
- drivers/input/touchscreen/.*: modules
129126
- drivers/input/.*: modules-core
130127
- drivers/interconnect/.*: modules-core
131-
- drivers/iommu/.*test.ko: modules-internal
132128
- drivers/iommu/.*: modules-core
133129
- drivers/irqchip/.*: modules-core
134130

@@ -246,7 +242,6 @@ rules:
246242
- drivers/perf/.*: modules-core
247243
- drivers/phy/.*: modules-core
248244
- drivers/pinctrl/.*: modules-core
249-
- drivers/platform/chrome/.*test.*: modules-internal
250245
- drivers/platform/x86/intel/intel_vsec.*: modules-core
251246
- drivers/pmdomain/.*: modules-core
252247
- drivers/powercap/intel_rapl_tpmi.*: modules
@@ -263,7 +258,6 @@ rules:
263258
- drivers/remoteproc/.*: modules-core
264259
- drivers/reset/.*: modules-core
265260
- drivers/rpmsg/.*: modules-core
266-
- drivers/rtc/.*test.*: modules-internal
267261
- drivers/rtc/.*: modules-core
268262

269263
- drivers/s390/net/ism.*: modules
@@ -370,7 +364,6 @@ rules:
370364
- drivers/w1/slaves/w1_smem.*: modules-extra
371365
- drivers/w1/slaves/w1_therm.*: modules-extra
372366

373-
- fs/.*test.*: modules-internal
374367
- fs/9p/.*: modules-core
375368
- fs/afs/.*: modules-partner
376369
- fs/affs/affs.*: modules-extra
@@ -410,26 +403,18 @@ rules:
410403
- fs/xfs/.*: modules-core
411404
- fs/zonefs/.*: modules-core
412405

413-
- kernel/.*test.*: modules-internal
414406
- kernel/locking/locktorture.*: modules-internal
415407
- kernel/rcu/rcuscale.*: modules-internal
416408
- kernel/rcu/rcutorture.*: modules-internal
417409
- kernel/rcu/refscale.*: modules-internal
418-
- kernel/resource_kunit.*: modules-internal
419410
- kernel/scftorture.*: modules-internal
420411
- kernel/torture.*: modules-internal
421412
- kernel/.*: modules-core
422413

423-
- lib/test_lockup.*: modules-extra
424-
- lib/.*(test|kunit).*: modules-internal
425-
exact_pkg: True
426414
- lib/.*: modules-core
427415

428-
- mm/kasan/kasan_test: modules-internal
429-
- mm/kfence/.*test.*: modules-internal
430416
- mm/zsmalloc.ko: modules-core
431417

432-
- net/.*test.*: modules-internal
433418
- net/802/.*: modules-core
434419
- net/8021q/.*: modules-core
435420
- net/9p/9pnet_rdma.ko: modules
@@ -495,8 +480,6 @@ rules:
495480
- net/xfrm/.*: modules-core
496481

497482
- samples/.*: modules-internal
498-
- sound/pci/.*test.*: modules-internal
499-
- sound/soc/.*test.*: modules-internal
500483

501484
- virt/.*: modules-core
502485

0 commit comments

Comments
 (0)