Skip to content

Commit

Permalink
drm/ci: add subset-1-gfx to LAVA_TAGS and adjust shards
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Helen Koike authored and Maxime Ripard committed Oct 26, 2023
1 parent 81224d9 commit 68a3f17
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/ci/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ variables:
JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
# default kernel for rootfs before injecting the current kernel tree
KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d

LAVA_TAGS: subset-1-gfx
LAVA_JOB_PRIORITY: 30

default:
Expand Down
23 changes: 14 additions & 9 deletions drivers/gpu/drm/ci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ msm:sc7180:
extends:
- .lava-igt:arm64
stage: msm
parallel: 2
parallel: 4
variables:
DRIVER_NAME: msm
DEVICE_TYPE: sc7180-trogdor-lazor-limozeen
Expand Down Expand Up @@ -155,7 +155,7 @@ rockchip:rk3399:
extends:
- .lava-igt:arm64
stage: rockchip
parallel: 3
parallel: 2
variables:
DRIVER_NAME: rockchip
DEVICE_TYPE: rk3399-gru-kevin
Expand All @@ -178,7 +178,7 @@ rockchip:rk3399:
i915:apl:
extends:
- .i915
parallel: 12
parallel: 3
variables:
DEVICE_TYPE: asus-C523NA-A20057-coral
GPU_VERSION: apl
Expand All @@ -187,7 +187,7 @@ i915:apl:
i915:glk:
extends:
- .i915
parallel: 5
parallel: 2
variables:
DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus
GPU_VERSION: glk
Expand All @@ -196,7 +196,7 @@ i915:glk:
i915:amly:
extends:
- .i915
parallel: 8
parallel: 2
variables:
DEVICE_TYPE: asus-C433TA-AJ0005-rammus
GPU_VERSION: amly
Expand All @@ -205,7 +205,7 @@ i915:amly:
i915:kbl:
extends:
- .i915
parallel: 5
parallel: 3
variables:
DEVICE_TYPE: hp-x360-14-G1-sona
GPU_VERSION: kbl
Expand All @@ -214,7 +214,7 @@ i915:kbl:
i915:whl:
extends:
- .i915
parallel: 8
parallel: 2
variables:
DEVICE_TYPE: dell-latitude-5400-8665U-sarien
GPU_VERSION: whl
Expand All @@ -223,7 +223,7 @@ i915:whl:
i915:cml:
extends:
- .i915
parallel: 6
parallel: 2
variables:
DEVICE_TYPE: asus-C436FA-Flip-hatch
GPU_VERSION: cml
Expand All @@ -232,7 +232,7 @@ i915:cml:
i915:tgl:
extends:
- .i915
parallel: 6
parallel: 8
variables:
DEVICE_TYPE: asus-cx9400-volteer
GPU_VERSION: tgl
Expand All @@ -251,6 +251,7 @@ i915:tgl:
amdgpu:stoney:
extends:
- .amdgpu
parallel: 2
variables:
DEVICE_TYPE: hp-11A-G6-EE-grunt
GPU_VERSION: stoney
Expand All @@ -269,6 +270,7 @@ amdgpu:stoney:
mediatek:mt8173:
extends:
- .mediatek
parallel: 4
variables:
DEVICE_TYPE: mt8173-elm-hana
GPU_VERSION: mt8173
Expand All @@ -280,6 +282,7 @@ mediatek:mt8173:
mediatek:mt8183:
extends:
- .mediatek
parallel: 3
variables:
DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16
GPU_VERSION: mt8183
Expand All @@ -289,6 +292,7 @@ mediatek:mt8183:
.mediatek:mt8192:
extends:
- .mediatek
parallel: 3
variables:
DEVICE_TYPE: mt8192-asurada-spherion-r0
GPU_VERSION: mt8192
Expand All @@ -307,6 +311,7 @@ mediatek:mt8183:
meson:g12b:
extends:
- .meson
parallel: 3
variables:
DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
GPU_VERSION: g12b
Expand Down

0 comments on commit 68a3f17

Please sign in to comment.