Skip to content

Commit f7bab02

Browse files
a-waiJenySadadia
authored andcommitted
config: fix coverage-report jobs
The current only `coverage-report` entry is using the x86 toolchain, making it unable to process arm* results. Fix this by splitting this job definition into 3 variants, one for each architecture for which we could want coverage support. Signed-off-by: Arnaud Ferraris <[email protected]>
1 parent d218862 commit f7bab02

File tree

2 files changed

+36
-8
lines changed

2 files changed

+36
-8
lines changed

config/jobs.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,32 @@ jobs:
156156
baseline-x86-mfd: *baseline-job
157157
baseline-x86-qualcomm: *baseline-job
158158

159-
coverage-report:
159+
coverage-report-arm: &coverage-report-job
160160
template: coverage-report.jinja2
161161
kind: job
162-
image: ghcr.io/kernelci/{image_prefix}gcc-12:x86-kselftest-kernelci
163-
rules:
162+
image: ghcr.io/kernelci/{image_prefix}gcc-12:arm-kselftest-kernelci
163+
rules: &coverage-report-rules
164+
arch:
165+
- arm
164166
fragments:
165167
- coverage
166168

169+
coverage-report-arm64:
170+
<<: *coverage-report-job
171+
image: ghcr.io/kernelci/{image_prefix}gcc-12:arm64-kselftest-kernelci
172+
rules:
173+
<<: *coverage-report-rules
174+
arch:
175+
- arm64
176+
177+
coverage-report-x86:
178+
<<: *coverage-report-job
179+
image: ghcr.io/kernelci/{image_prefix}gcc-12:x86-kselftest-kernelci
180+
rules:
181+
<<: *coverage-report-rules
182+
arch:
183+
- x86_64
184+
167185
kbuild-clang-17-arm: &kbuild-clang-17-arm-job
168186
<<: *kbuild-job
169187
image: ghcr.io/kernelci/{image_prefix}clang-17:arm-kselftest-kernelci

config/scheduler.yaml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ _anchors:
2020
kind: kbuild
2121
state: available
2222

23+
node-event-kbuild-done: &node-event-kbuild-done
24+
<<: *node-event-kbuild
25+
state: done
26+
result: pass
27+
2328
job-event: &job-event
2429
channel: node
2530
state: done
@@ -332,12 +337,17 @@ scheduler:
332337
platforms:
333338
- supermicro-as-2015hr-tnr
334339

335-
- job: coverage-report
340+
- job: coverage-report-arm
336341
<<: *build-k8s-all
337-
event:
338-
<<: *node-event-kbuild
339-
state: done
340-
result: pass
342+
event: *node-event-kbuild-done
343+
344+
- job: coverage-report-arm64
345+
<<: *build-k8s-all
346+
event: *node-event-kbuild-done
347+
348+
- job: coverage-report-x86
349+
<<: *build-k8s-all
350+
event: *node-event-kbuild-done
341351

342352
- job: kbuild-clang-17-arm
343353
<<: *build-k8s-all

0 commit comments

Comments
 (0)