broadcom/ci: refactor a bit

Just moving things around, no functional change.

Signed-off-by: Eric Engestrom <eric@igalia.com>
Acked-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21297>
This commit is contained in:
Eric Engestrom 2023-02-13 21:05:34 +00:00 committed by Marge Bot
parent 84e5d50b89
commit 2eb8716be8

View file

@ -1,12 +1,29 @@
.vc4-rpi3-test:armhf:
.broadcom-test:
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
FLAKES_CHANNEL: "#videocore-ci"
.broadcom-test:arm64:
extends:
- .broadcom-test
- .baremetal-test-arm64
variables:
BM_BOOTFS: /boot/raspberrypi_arm64
.broadcom-test:armhf:
extends:
- .broadcom-test
- .baremetal-test-armhf
- .vc4-rules
variables:
BM_BOOTFS: /boot/raspberrypi_armhf
.vc4-rpi3-test:armhf:
extends:
- .broadcom-test:armhf
- .vc4-rules
variables:
GPU_VERSION: broadcom-rpi3
HWCI_KERNEL_MODULES: vc4
FLAKES_CHANNEL: "#videocore-ci"
script:
- ./install/bare-metal/poe-powered.sh
tags:
@ -17,7 +34,6 @@ vc4-rpi3:armhf:
- .vc4-rpi3-test:armhf
parallel: 3
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_SUITE: broadcom-rpi3
PIGLIT_PLATFORM: gbm
@ -25,7 +41,6 @@ vc4-rpi3-egl:armhf:
extends:
- .vc4-rpi3-test:armhf
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
HWCI_START_XORG: 1
HWCI_START_WESTON: 1
DEQP_SUITE: broadcom-rpi3-egl
@ -36,6 +51,7 @@ vc4-rpi3-egl:armhf:
- .vc4-rpi3-test:armhf
variables:
HWCI_START_XORG: 1
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
PIGLIT_PLATFORM: mixed_glx_egl
vc4-rpi3-piglit-quick_gl:armhf:
@ -48,12 +64,9 @@ vc4-rpi3-piglit-quick_gl:armhf:
.v3d-rpi4-test:armhf:
extends:
- .baremetal-test-armhf
- .broadcom-test:armhf
- .v3d-rules
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_armhf
FLAKES_CHANNEL: "#videocore-ci"
GPU_VERSION: broadcom-rpi4
HWCI_KERNEL_MODULES: v3d,vc4
script:
@ -90,10 +103,9 @@ v3d-rpi4-piglit:armhf:
v3d-rpi4-traces:arm64:
extends:
- .piglit-traces-test
- .baremetal-test-arm64
- .broadcom-test:arm64
- .v3d-manual-rules
variables:
BM_BOOTFS: /boot/raspberrypi_arm64
GPU_VERSION: broadcom-rpi4
HWCI_KERNEL_MODULES: v3d,vc4
HWCI_START_XORG: 1
@ -109,12 +121,11 @@ v3d-rpi4-traces:arm64:
v3dv-rpi4-vk:arm64:
extends:
- .baremetal-test-arm64
- .broadcom-test:arm64
- .v3dv-rules
parallel: 8
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_arm64
DEQP_EXPECTED_RENDERER: "V3D.4.2"
DEQP_FRACTION: 10
DEQP_VER: vk