ci/angle: condense angle variables in one job

Use .test-angle as a full-featured job to be extended to enable angle
usage in the job. Right now, it comes with USE_ANGLE=1 flag and the
respective structural tag.

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33421>
This commit is contained in:
Guilherme Gallo 2025-02-07 00:53:29 -03:00 committed by Marge Bot
parent 3b01d6e900
commit 94f5cf901e
4 changed files with 11 additions and 2 deletions

View file

@ -182,6 +182,12 @@ yaml-toml-shell-py-test:
variables:
ANGLE_TAG: ${CONDITIONAL_BUILD_ANGLE_TAG}
.test-angle:
extends:
- .tag-check-angle
variables:
USE_ANGLE: 1
.b2c-vkd3d-proton-test:
variables:
HWCI_TEST_SCRIPT: install/vkd3d-runner.sh

View file

@ -84,6 +84,7 @@ a618-angle:
- .lava-test-deqp:arm64
- .lava-sc7180-trogdor-kingoftown:arm64
- .collabora-turnip-manual-rules
- .test-angle
variables:
DEQP_SUITE: tu-angle
USE_ANGLE: 1
@ -232,6 +233,7 @@ a660-angle:
- .lava-test-deqp:arm64
- .lava-sm8350-hdk:arm64
- .collabora-turnip-manual-rules
- .test-angle
variables:
DEQP_SUITE: tu-angle
USE_ANGLE: 1
@ -420,6 +422,7 @@ a750-angle:
- .b2c-arm64-test-gl
- .a750-mupuf
- .valve-turnip-manual-rules
- .test-angle
timeout: 25m # base runtime 10min total, 7min of testing
variables:
USE_ANGLE: 1

View file

@ -59,7 +59,6 @@ lavapipe-vkd3d:
android-angle-lavapipe:
variables:
USE_ANGLE: 1
ANDROID_GPU_MODE: mesa_swrast_guest_angle
DEQP_SUITE: android-angle-lavapipe
GPU_VERSION: lvp-android-angle
@ -68,3 +67,4 @@ android-angle-lavapipe:
extends:
- .test-android
- .lavapipe-rules
- .test-angle

View file

@ -41,8 +41,8 @@ venus-lavapipe-full:
extends:
- .test-android
- .venus-manual-rules
- .test-angle
variables:
USE_ANGLE: 1
ANDROID_GPU_MODE: venus_guest_angle
GPU_VERSION: venus
DEQP_SUITE: android-venus-angle