ci: rename .lava-test to .lava-test-deqp to describe it correctly
.lava-test hidden job was setting the HWCI_TEST_SCRIPT variable to deqp runner. But that is not always the case. When we run piglit traces jobs, we use piglit-traces.sh instead, for example. Splitting into: - .lava-test-deqp (deqp-runner + deqp) - .lava-traces (deqp-runner + piglit) - .lava-piglit (piglit-runner + piglit) Signed-off-by: David Heidelberg <david.heidelberg@collabora.com> Co-authored-by: Guilherme Gallo <guilherme.gallo@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22065>
This commit is contained in:

committed by
Marge Bot

parent
8e5c33f8a2
commit
2314a0d59b
@@ -33,7 +33,7 @@
|
||||
after_script:
|
||||
- curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s "https://${JOB_RESULTS_PATH}" | tar --zstd -x
|
||||
|
||||
.lava-test:armhf:
|
||||
.lava-test-deqp:armhf:
|
||||
variables:
|
||||
ARCH: armhf
|
||||
KERNEL_IMAGE_NAME: zImage
|
||||
@@ -50,7 +50,7 @@
|
||||
- debian/x86_build
|
||||
- debian-armhf
|
||||
|
||||
.lava-test:arm64:
|
||||
.lava-test-deqp:arm64:
|
||||
variables:
|
||||
ARCH: arm64
|
||||
KERNEL_IMAGE_NAME: Image
|
||||
@@ -69,13 +69,12 @@
|
||||
- debian/x86_build
|
||||
- debian-arm64
|
||||
|
||||
.lava-test:amd64:
|
||||
.lava-test-deqp:amd64:
|
||||
variables:
|
||||
ARCH: amd64
|
||||
KERNEL_IMAGE_NAME: bzImage
|
||||
KERNEL_IMAGE_TYPE: "zimage"
|
||||
BOOT_METHOD: u-boot
|
||||
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
|
||||
extends:
|
||||
- .use-debian/x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
|
||||
- .use-debian/x86_build
|
||||
@@ -100,25 +99,25 @@
|
||||
|
||||
.lava-piglit-traces:amd64:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
- .lava-piglit
|
||||
- .lava-traces-base
|
||||
|
||||
.lava-piglit-traces:armhf:
|
||||
extends:
|
||||
- .lava-test:armhf
|
||||
- .lava-test-deqp:armhf
|
||||
- .lava-piglit
|
||||
- .lava-traces-base
|
||||
|
||||
.lava-piglit-traces:arm64:
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .lava-piglit
|
||||
- .lava-traces-base
|
||||
|
||||
.lava-piglit:amd64:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
- .lava-piglit
|
||||
|
||||
.lava-piglit:arm64:
|
||||
|
@@ -38,7 +38,7 @@
|
||||
# Run five jobs in parallel each running 1/55th of the test suite
|
||||
radv-stoney-vkcts:amd64:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
- .radv-stoney-test:amd64
|
||||
parallel: 5
|
||||
variables:
|
||||
@@ -46,7 +46,7 @@ radv-stoney-vkcts:amd64:
|
||||
|
||||
radeonsi-stoney-gl:amd64:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
- .radeonsi-stoney-test:amd64
|
||||
parallel: 11
|
||||
variables:
|
||||
@@ -108,7 +108,7 @@ radeonsi-stoney-traces:amd64:
|
||||
|
||||
radv-raven-vkcts:amd64:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
- .radv-raven-test:amd64
|
||||
- .lava-asus-CM1400CXA-dalboz:amd64
|
||||
parallel: 9
|
||||
@@ -118,7 +118,7 @@ radv-raven-vkcts:amd64:
|
||||
|
||||
amd-raven-skqp:amd64:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
- .amd-raven-test:amd64
|
||||
- .lava-lenovo-TPad-C13-Yoga-zork:amd64
|
||||
variables:
|
||||
@@ -161,7 +161,7 @@ radeonsi-raven-piglit-quick_shader:amd64:
|
||||
|
||||
radeonsi-raven-va:amd64:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
- .radeonsi-raven-test:amd64
|
||||
- .radeonsi-vaapi-rules
|
||||
- .lava-asus-CM1400CXA-dalboz:amd64
|
||||
|
@@ -1,6 +1,6 @@
|
||||
.lava-meson-gxl-s805x-libretech-ac:
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .lima-rules
|
||||
variables:
|
||||
DEVICE_TYPE: meson-gxl-s805x-libretech-ac
|
||||
|
@@ -101,7 +101,7 @@ zink-anv-tgl-traces-restricted:
|
||||
|
||||
zink-tu-a618:
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .a618-test
|
||||
- .zink-turnip-rules
|
||||
- .zink-test
|
||||
|
@@ -1,6 +1,6 @@
|
||||
.intel-common-test:
|
||||
extends:
|
||||
- .lava-test:amd64
|
||||
- .lava-test-deqp:amd64
|
||||
variables:
|
||||
DTB: ""
|
||||
BOOT_METHOD: depthcharge
|
||||
|
@@ -29,7 +29,7 @@
|
||||
|
||||
panfrost-t720-gles2:arm64:
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .panfrost-midgard-rules
|
||||
- .panfrost-test
|
||||
variables:
|
||||
@@ -44,7 +44,7 @@ panfrost-t720-gles2:arm64:
|
||||
# Keep the second t760 job manual.
|
||||
panfrost-t760-gles2:armhf:
|
||||
extends:
|
||||
- .lava-test:armhf
|
||||
- .lava-test-deqp:armhf
|
||||
- .panfrost-midgard-manual-rules
|
||||
- .panfrost-test
|
||||
- .lava-rk3288-veyron-jaq
|
||||
@@ -73,7 +73,7 @@ panfrost-t760-gles2:armhf:
|
||||
panfrost-t860-gl:arm64:
|
||||
parallel: 3
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .lava-rk3399-gru-kevin
|
||||
variables:
|
||||
FDO_CI_CONCURRENT: 6
|
||||
@@ -81,7 +81,7 @@ panfrost-t860-gl:arm64:
|
||||
|
||||
panfrost-t860-egl:arm64:
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .lava-rk3399-gru-kevin
|
||||
variables:
|
||||
HWCI_START_WESTON: 1
|
||||
@@ -106,7 +106,7 @@ panfrost-t860-egl:arm64:
|
||||
panfrost-g52-gl:arm64:
|
||||
parallel: 3
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .lava-meson-g12b-a311d-khadas-vim3
|
||||
variables:
|
||||
FDO_CI_CONCURRENT: 6
|
||||
@@ -115,7 +115,7 @@ panfrost-g52-gl:arm64:
|
||||
|
||||
.panfrost-g52-vk:arm64:
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .lava-meson-g12b-a311d-khadas-vim3
|
||||
variables:
|
||||
VK_DRIVER: panfrost
|
||||
@@ -148,14 +148,14 @@ panfrost-g52-piglit-gles2:arm64:
|
||||
panfrost-g72-gl:arm64:
|
||||
parallel: 3
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .lava-mt8183-kukui-jacuzzi-juniper-sku16
|
||||
variables:
|
||||
DEQP_SUITE: panfrost-g72
|
||||
|
||||
.panfrost-t820-gles2:arm64:
|
||||
extends:
|
||||
- .lava-test:arm64
|
||||
- .lava-test-deqp:arm64
|
||||
- .panfrost-midgard-rules
|
||||
- .panfrost-test
|
||||
variables:
|
||||
|
Reference in New Issue
Block a user