Commit 6a105a3c authored by Helen Koike's avatar Helen Koike Committed by Ma Wupeng
Browse files

drm/ci: add subset-1-gfx to LAVA_TAGS and adjust shards 

stable inclusion
from stable-v6.6.33
commit aa03f049d4539db72b5ec1c6c2307dcb4e65f9c1
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAD6H2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=aa03f049d4539db72b5ec1c6c2307dcb4e65f9c1



--------------------------------

[ Upstream commit 68a3f17732d1d72be958576b6ce0e6c29686a40b ]

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: default avatarHelen Koike <helen.koike@collabora.com>
Reviewed-by: default avatarDavid Heidelberg <david.heidelberg@collabora.com>
Link: https://lore.kernel.org/r/20231024004525.169002-7-helen.koike@collabora.com


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
Stable-dep-of: a2c71b711e7e ("drm/ci: update device type for volteer devices")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
parent e1040d26

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

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/gpu/drm/ci/test.yml

+14 −9
Original line number Diff line number Diff line
@@ -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
@@ -158,7 +158,7 @@ rockchip:rk3399: 
  extends:

    - .lava-igt:arm64

  stage: rockchip

  parallel: 3

  parallel: 2

  variables:

    DRIVER_NAME: rockchip

    DEVICE_TYPE: rk3399-gru-kevin
@@ -181,7 +181,7 @@ rockchip:rk3399: 
i915:apl:

  extends:

    - .i915

  parallel: 12

  parallel: 3

  variables:

    DEVICE_TYPE: asus-C523NA-A20057-coral

    GPU_VERSION: apl
@@ -190,7 +190,7 @@ i915:apl: 
i915:glk:

  extends:

    - .i915

  parallel: 5

  parallel: 2

  variables:

    DEVICE_TYPE: hp-x360-12b-ca0010nr-n4020-octopus

    GPU_VERSION: glk
@@ -199,7 +199,7 @@ i915:glk: 
i915:amly:

  extends:

    - .i915

  parallel: 8

  parallel: 2

  variables:

    DEVICE_TYPE: asus-C433TA-AJ0005-rammus

    GPU_VERSION: amly
@@ -208,7 +208,7 @@ i915:amly: 
i915:kbl:

  extends:

    - .i915

  parallel: 5

  parallel: 3

  variables:

    DEVICE_TYPE: hp-x360-14-G1-sona

    GPU_VERSION: kbl
@@ -217,7 +217,7 @@ i915:kbl: 
i915:whl:

  extends:

    - .i915

  parallel: 8

  parallel: 2

  variables:

    DEVICE_TYPE: dell-latitude-5400-8665U-sarien

    GPU_VERSION: whl
@@ -226,7 +226,7 @@ i915:whl: 
i915:cml:

  extends:

    - .i915

  parallel: 6

  parallel: 2

  variables:

    DEVICE_TYPE: asus-C436FA-Flip-hatch

    GPU_VERSION: cml
@@ -235,7 +235,7 @@ i915:cml: 
i915:tgl:

  extends:

    - .i915

  parallel: 6

  parallel: 8

  variables:

    DEVICE_TYPE: asus-cx9400-volteer

    GPU_VERSION: tgl
@@ -254,6 +254,7 @@ i915:tgl: 
amdgpu:stoney:

  extends:

    - .amdgpu

  parallel: 2

  variables:

    DEVICE_TYPE: hp-11A-G6-EE-grunt

    GPU_VERSION: stoney
@@ -272,6 +273,7 @@ amdgpu:stoney: 
mediatek:mt8173:

  extends:

    - .mediatek

  parallel: 4

  variables:

    DEVICE_TYPE: mt8173-elm-hana

    GPU_VERSION: mt8173
@@ -283,6 +285,7 @@ mediatek:mt8173: 
mediatek:mt8183:

  extends:

    - .mediatek

  parallel: 3

  variables:

    DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16

    GPU_VERSION: mt8183
@@ -292,6 +295,7 @@ mediatek:mt8183: 
.mediatek:mt8192:

  extends:

    - .mediatek

  parallel: 3

  variables:

    DEVICE_TYPE: mt8192-asurada-spherion-r0

    GPU_VERSION: mt8192
@@ -310,6 +314,7 @@ mediatek:mt8183: 
meson:g12b:

  extends:

    - .meson

  parallel: 3

  variables:

    DEVICE_TYPE: meson-g12b-a311d-khadas-vim3

    GPU_VERSION: g12b