Skip to content

Commit e23a836

Browse files
committed
config: chromeos: enable LTP tests for coverage-enabled kernels
This requires changing the LTP jobs' definition to allow running on kernels for which the `kselftest` fragment has been enabled. AFAIK this restriction has been ported from the legacy KernelCI config and was likely only needed back then to avoid scheduling too many instances of LTP jobs. It is therefore unnecessary on Maestro which allows for more fine-grained scheduling. Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
1 parent 8c9f870 commit e23a836

File tree

2 files changed

+144
-3
lines changed

2 files changed

+144
-3
lines changed

config/jobs-chromeos.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ _anchors:
126126
extra_kernel_args: "lsm=capability,landlock,yama,loadpin,safesetid,selinux,bpf"
127127
kcidb_test_suite: ltp
128128
rules: &ltp-cros-kernel-rules
129-
fragments:
130-
- '!kselftest'
131129
tree:
132130
- chromiumos
133131

@@ -811,7 +809,6 @@ jobs:
811809
<<: *ltp-cros-kernel-rules
812810
fragments:
813811
- 'crypto'
814-
- '!kselftest'
815812

816813
ltp-ima-cros-kernel:
817814
<<: *ltp-cros-kernel-job

config/scheduler-chromeos.yaml

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ _anchors:
6161
name: kbuild-gcc-12-arm64-chromebook
6262
platforms: *mediatek-platforms
6363

64+
test-job-arm64-mediatek-coverage: &test-job-arm64-mediatek-coverage
65+
<<: *test-job-arm64-mediatek
66+
event:
67+
<<: *kbuild-event
68+
name: kbuild-gcc-12-arm64-chromeos-mediatek-coverage
69+
6470
test-job-arm64-mediatek-cros-kernel: &test-job-arm64-mediatek-cros-kernel
6571
<<: *test-job-arm64-mediatek
6672
event:
@@ -77,6 +83,12 @@ _anchors:
7783
<<: *test-job-arm64-mediatek
7884
platforms: *qualcomm-platforms
7985

86+
test-job-arm64-qualcomm-coverage: &test-job-arm64-qualcomm-coverage
87+
<<: *test-job-arm64-qualcomm
88+
event:
89+
<<: *kbuild-event
90+
name: kbuild-gcc-12-arm64-chromeos-qualcomm-coverage
91+
8092
test-job-arm64-qualcomm-cros-kernel: &test-job-arm64-qualcomm-cros-kernel
8193
<<: *test-job-arm64-qualcomm
8294
event:
@@ -123,6 +135,12 @@ _anchors:
123135
<<: *test-job-x86
124136
platforms: *amd-platforms
125137

138+
test-job-x86-amd-coverage: &test-job-x86-amd-coverage
139+
<<: *test-job-x86-amd
140+
event:
141+
<<: *test-job-x86-event
142+
name: kbuild-gcc-12-x86-chromeos-amd-coverage
143+
126144
test-job-x86-amd-cros-kernel: &test-job-x86-amd-cros-kernel
127145
<<: *test-job-x86-amd
128146
event:
@@ -133,6 +151,12 @@ _anchors:
133151
<<: *test-job-x86
134152
platforms: *intel-platforms
135153

154+
test-job-x86-intel-coverage: &test-job-x86-intel-coverage
155+
<<: *test-job-x86-intel
156+
event:
157+
<<: *test-job-x86-event
158+
name: kbuild-gcc-12-x86-chromeos-intel-coverage
159+
136160
test-job-x86-intel-cros-kernel: &test-job-x86-intel-cros-kernel
137161
<<: *test-job-x86-intel
138162
event:
@@ -504,123 +528,243 @@ scheduler:
504528
- asus-C523NA-A20057-coral
505529
- hp-11A-G6-EE-grunt
506530

531+
- job: ltp-capability-cros-kernel
532+
<<: *test-job-arm64-mediatek-coverage
533+
507534
- job: ltp-capability-cros-kernel
508535
<<: *test-job-arm64-mediatek-cros-kernel
509536

537+
- job: ltp-capability-cros-kernel
538+
<<: *test-job-arm64-qualcomm-coverage
539+
510540
- job: ltp-capability-cros-kernel
511541
<<: *test-job-arm64-qualcomm-cros-kernel
512542

543+
- job: ltp-capability-cros-kernel
544+
<<: *test-job-x86-amd-coverage
545+
513546
- job: ltp-capability-cros-kernel
514547
<<: *test-job-x86-amd-cros-kernel
515548

549+
- job: ltp-capability-cros-kernel
550+
<<: *test-job-x86-intel-coverage
551+
516552
- job: ltp-capability-cros-kernel
517553
<<: *test-job-x86-intel-cros-kernel
518554

555+
- job: ltp-containers-cros-kernel
556+
<<: *test-job-arm64-mediatek-coverage
557+
519558
- job: ltp-containers-cros-kernel
520559
<<: *test-job-arm64-mediatek-cros-kernel
521560

561+
- job: ltp-containers-cros-kernel
562+
<<: *test-job-arm64-qualcomm-coverage
563+
522564
- job: ltp-containers-cros-kernel
523565
<<: *test-job-arm64-qualcomm-cros-kernel
524566

567+
- job: ltp-containers-cros-kernel
568+
<<: *test-job-x86-amd-coverage
569+
525570
- job: ltp-containers-cros-kernel
526571
<<: *test-job-x86-amd-cros-kernel
527572

573+
- job: ltp-containers-cros-kernel
574+
<<: *test-job-x86-intel-coverage
575+
528576
- job: ltp-containers-cros-kernel
529577
<<: *test-job-x86-intel-cros-kernel
530578

579+
- job: ltp-crypto-cros-kernel
580+
<<: *test-job-arm64-mediatek-coverage
581+
531582
- job: ltp-crypto-cros-kernel
532583
<<: *test-job-arm64-mediatek-cros-kernel
533584

585+
- job: ltp-crypto-cros-kernel
586+
<<: *test-job-arm64-qualcomm-coverage
587+
534588
- job: ltp-crypto-cros-kernel
535589
<<: *test-job-arm64-qualcomm-cros-kernel
536590

591+
- job: ltp-crypto-cros-kernel
592+
<<: *test-job-x86-amd-coverage
593+
537594
- job: ltp-crypto-cros-kernel
538595
<<: *test-job-x86-amd-cros-kernel
539596

597+
- job: ltp-crypto-cros-kernel
598+
<<: *test-job-x86-intel-coverage
599+
540600
- job: ltp-crypto-cros-kernel
541601
<<: *test-job-x86-intel-cros-kernel
542602

603+
- job: ltp-ima-cros-kernel
604+
<<: *test-job-arm64-mediatek-coverage
605+
543606
- job: ltp-ima-cros-kernel
544607
<<: *test-job-arm64-mediatek-cros-kernel
545608

609+
- job: ltp-ima-cros-kernel
610+
<<: *test-job-arm64-qualcomm-coverage
611+
546612
- job: ltp-ima-cros-kernel
547613
<<: *test-job-arm64-qualcomm-cros-kernel
548614

615+
- job: ltp-ima-cros-kernel
616+
<<: *test-job-x86-amd-coverage
617+
549618
- job: ltp-ima-cros-kernel
550619
<<: *test-job-x86-amd-cros-kernel
551620

621+
- job: ltp-ima-cros-kernel
622+
<<: *test-job-x86-intel-coverage
623+
552624
- job: ltp-ima-cros-kernel
553625
<<: *test-job-x86-intel-cros-kernel
554626

627+
- job: ltp-input-cros-kernel
628+
<<: *test-job-arm64-mediatek-coverage
629+
555630
- job: ltp-input-cros-kernel
556631
<<: *test-job-arm64-mediatek-cros-kernel
557632

633+
- job: ltp-input-cros-kernel
634+
<<: *test-job-arm64-qualcomm-coverage
635+
558636
- job: ltp-input-cros-kernel
559637
<<: *test-job-arm64-qualcomm-cros-kernel
560638

639+
- job: ltp-input-cros-kernel
640+
<<: *test-job-x86-amd-coverage
641+
561642
- job: ltp-input-cros-kernel
562643
<<: *test-job-x86-amd-cros-kernel
563644

645+
- job: ltp-input-cros-kernel
646+
<<: *test-job-x86-intel-coverage
647+
564648
- job: ltp-input-cros-kernel
565649
<<: *test-job-x86-intel-cros-kernel
566650

651+
- job: ltp-ipc-cros-kernel
652+
<<: *test-job-arm64-mediatek-coverage
653+
567654
- job: ltp-ipc-cros-kernel
568655
<<: *test-job-arm64-mediatek-cros-kernel
569656

657+
- job: ltp-ipc-cros-kernel
658+
<<: *test-job-arm64-qualcomm-coverage
659+
570660
- job: ltp-ipc-cros-kernel
571661
<<: *test-job-arm64-qualcomm-cros-kernel
572662

663+
- job: ltp-ipc-cros-kernel
664+
<<: *test-job-x86-amd-coverage
665+
573666
- job: ltp-ipc-cros-kernel
574667
<<: *test-job-x86-amd-cros-kernel
575668

669+
- job: ltp-ipc-cros-kernel
670+
<<: *test-job-x86-intel-coverage
671+
576672
- job: ltp-ipc-cros-kernel
577673
<<: *test-job-x86-intel-cros-kernel
578674

675+
- job: ltp-kernel-misc-cros-kernel
676+
<<: *test-job-arm64-mediatek-coverage
677+
579678
- job: ltp-kernel-misc-cros-kernel
580679
<<: *test-job-arm64-mediatek-cros-kernel
581680

681+
- job: ltp-kernel-misc-cros-kernel
682+
<<: *test-job-arm64-qualcomm-coverage
683+
582684
- job: ltp-kernel-misc-cros-kernel
583685
<<: *test-job-arm64-qualcomm-cros-kernel
584686

687+
- job: ltp-kernel-misc-cros-kernel
688+
<<: *test-job-x86-amd-coverage
689+
585690
- job: ltp-kernel-misc-cros-kernel
586691
<<: *test-job-x86-amd-cros-kernel
587692

693+
- job: ltp-kernel-misc-cros-kernel
694+
<<: *test-job-x86-intel-coverage
695+
588696
- job: ltp-kernel-misc-cros-kernel
589697
<<: *test-job-x86-intel-cros-kernel
590698

699+
- job: ltp-mm-cros-kernel
700+
<<: *test-job-arm64-mediatek-coverage
701+
591702
- job: ltp-mm-cros-kernel
592703
<<: *test-job-arm64-mediatek-cros-kernel
593704

705+
- job: ltp-mm-cros-kernel
706+
<<: *test-job-arm64-qualcomm-coverage
707+
594708
- job: ltp-mm-cros-kernel
595709
<<: *test-job-arm64-qualcomm-cros-kernel
596710

711+
- job: ltp-mm-cros-kernel
712+
<<: *test-job-x86-amd-coverage
713+
597714
- job: ltp-mm-cros-kernel
598715
<<: *test-job-x86-amd-cros-kernel
599716

717+
- job: ltp-mm-cros-kernel
718+
<<: *test-job-x86-intel-coverage
719+
600720
- job: ltp-mm-cros-kernel
601721
<<: *test-job-x86-intel-cros-kernel
602722

723+
- job: ltp-pty-cros-kernel
724+
<<: *test-job-arm64-mediatek-coverage
725+
603726
- job: ltp-pty-cros-kernel
604727
<<: *test-job-arm64-mediatek-cros-kernel
605728

729+
- job: ltp-pty-cros-kernel
730+
<<: *test-job-arm64-qualcomm-coverage
731+
606732
- job: ltp-pty-cros-kernel
607733
<<: *test-job-arm64-qualcomm-cros-kernel
608734

735+
- job: ltp-pty-cros-kernel
736+
<<: *test-job-x86-amd-coverage
737+
609738
- job: ltp-pty-cros-kernel
610739
<<: *test-job-x86-amd-cros-kernel
611740

741+
- job: ltp-pty-cros-kernel
742+
<<: *test-job-x86-intel-coverage
743+
612744
- job: ltp-pty-cros-kernel
613745
<<: *test-job-x86-intel-cros-kernel
614746

747+
- job: ltp-sched-cros-kernel
748+
<<: *test-job-arm64-mediatek-coverage
749+
615750
- job: ltp-sched-cros-kernel
616751
<<: *test-job-arm64-mediatek-cros-kernel
617752

753+
- job: ltp-sched-cros-kernel
754+
<<: *test-job-arm64-qualcomm-coverage
755+
618756
- job: ltp-sched-cros-kernel
619757
<<: *test-job-arm64-qualcomm-cros-kernel
620758

759+
- job: ltp-sched-cros-kernel
760+
<<: *test-job-x86-amd-coverage
761+
621762
- job: ltp-sched-cros-kernel
622763
<<: *test-job-x86-amd-cros-kernel
623764

765+
- job: ltp-sched-cros-kernel
766+
<<: *test-job-x86-intel-coverage
767+
624768
- job: ltp-sched-cros-kernel
625769
<<: *test-job-x86-intel-cros-kernel
626770

0 commit comments

Comments
 (0)