Skip to content

Commit 68a3f17

Browse files
Helen Koikemripard
authored andcommitted
drm/ci: add subset-1-gfx to LAVA_TAGS and adjust shards
The Collabora Lava farm added a tag called `subset-1-gfx` to half of devices the graphics community use. Lets use this tag so we don't occupy all the resources. This is particular important because Mesa3D shares the resources with DRM-CI and use them to do pre-merge tests, so it can block developers from getting their patches merged. Signed-off-by: Helen Koike <helen.koike@collabora.com> Reviewed-by: David Heidelberg <david.heidelberg@collabora.com> Link: https://lore.kernel.org/r/20231024004525.169002-7-helen.koike@collabora.com Signed-off-by: Maxime Ripard <mripard@kernel.org>
1 parent 81224d9 commit 68a3f17

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

drivers/gpu/drm/ci/gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ variables:
2626
JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
2727
# default kernel for rootfs before injecting the current kernel tree
2828
KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d
29-
29+
LAVA_TAGS: subset-1-gfx
3030
LAVA_JOB_PRIORITY: 30
3131

3232
default:

drivers/gpu/drm/ci/test.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ msm:sc7180:
8686
extends:
8787
- .lava-igt:arm64
8888
stage: msm
89-
parallel: 2
89+
parallel: 4
9090
variables:
9191
DRIVER_NAME: msm
9292
DEVICE_TYPE: sc7180-trogdor-lazor-limozeen
@@ -155,7 +155,7 @@ rockchip:rk3399:
155155
extends:
156156
- .lava-igt:arm64
157157
stage: rockchip
158-
parallel: 3
158+
parallel: 2
159159
variables:
160160
DRIVER_NAME: rockchip
161161
DEVICE_TYPE: rk3399-gru-kevin
@@ -178,7 +178,7 @@ rockchip:rk3399:
178178
i915:apl:
179179
extends:
180180
- .i915
181-
parallel: 12
181+
parallel: 3
182182
variables:
183183
DEVICE_TYPE: asus-C523NA-A20057-coral
184184
GPU_VERSION: apl
@@ -187,7 +187,7 @@ i915:apl:
187187
i915:glk:
188188
extends:
189189
- .i915
190-
parallel: 5
190+
parallel: 2
191191
variables:
192192
DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus
193193
GPU_VERSION: glk
@@ -196,7 +196,7 @@ i915:glk:
196196
i915:amly:
197197
extends:
198198
- .i915
199-
parallel: 8
199+
parallel: 2
200200
variables:
201201
DEVICE_TYPE: asus-C433TA-AJ0005-rammus
202202
GPU_VERSION: amly
@@ -205,7 +205,7 @@ i915:amly:
205205
i915:kbl:
206206
extends:
207207
- .i915
208-
parallel: 5
208+
parallel: 3
209209
variables:
210210
DEVICE_TYPE: hp-x360-14-G1-sona
211211
GPU_VERSION: kbl
@@ -214,7 +214,7 @@ i915:kbl:
214214
i915:whl:
215215
extends:
216216
- .i915
217-
parallel: 8
217+
parallel: 2
218218
variables:
219219
DEVICE_TYPE: dell-latitude-5400-8665U-sarien
220220
GPU_VERSION: whl
@@ -223,7 +223,7 @@ i915:whl:
223223
i915:cml:
224224
extends:
225225
- .i915
226-
parallel: 6
226+
parallel: 2
227227
variables:
228228
DEVICE_TYPE: asus-C436FA-Flip-hatch
229229
GPU_VERSION: cml
@@ -232,7 +232,7 @@ i915:cml:
232232
i915:tgl:
233233
extends:
234234
- .i915
235-
parallel: 6
235+
parallel: 8
236236
variables:
237237
DEVICE_TYPE: asus-cx9400-volteer
238238
GPU_VERSION: tgl
@@ -251,6 +251,7 @@ i915:tgl:
251251
amdgpu:stoney:
252252
extends:
253253
- .amdgpu
254+
parallel: 2
254255
variables:
255256
DEVICE_TYPE: hp-11A-G6-EE-grunt
256257
GPU_VERSION: stoney
@@ -269,6 +270,7 @@ amdgpu:stoney:
269270
mediatek:mt8173:
270271
extends:
271272
- .mediatek
273+
parallel: 4
272274
variables:
273275
DEVICE_TYPE: mt8173-elm-hana
274276
GPU_VERSION: mt8173
@@ -280,6 +282,7 @@ mediatek:mt8173:
280282
mediatek:mt8183:
281283
extends:
282284
- .mediatek
285+
parallel: 3
283286
variables:
284287
DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16
285288
GPU_VERSION: mt8183
@@ -289,6 +292,7 @@ mediatek:mt8183:
289292
.mediatek:mt8192:
290293
extends:
291294
- .mediatek
295+
parallel: 3
292296
variables:
293297
DEVICE_TYPE: mt8192-asurada-spherion-r0
294298
GPU_VERSION: mt8192
@@ -307,6 +311,7 @@ mediatek:mt8183:
307311
meson:g12b:
308312
extends:
309313
- .meson
314+
parallel: 3
310315
variables:
311316
DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
312317
GPU_VERSION: g12b

0 commit comments

Comments
 (0)