ci/valve: split .b2c-test into .b2c-test-vk and .b2c-test-gl
We have to use a different test image for GL. Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Martin Roukala <martin.roukala@mupuf.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16975>
This commit is contained in:
parent
c895e5d140
commit
8ffabb2511
|
@ -185,8 +185,6 @@
|
|||
# depend on more than one image per job. So, the job container is
|
||||
# built as part of the CI in the boot2container project.
|
||||
image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-03-03.2
|
||||
extends:
|
||||
- .use-debian/x86_test-vk
|
||||
timeout: 1h 40m
|
||||
variables:
|
||||
# No need by default to pull the whole repo
|
||||
|
@ -308,9 +306,6 @@
|
|||
# Gitlab coordinator for status presentation. results/junit.xml
|
||||
# will be parsed by the UI for more detailed explanations of
|
||||
# test execution.
|
||||
needs:
|
||||
- debian/x86_test-vk
|
||||
- debian-testing
|
||||
artifacts:
|
||||
when: always
|
||||
name: "mesa_${CI_JOB_NAME}"
|
||||
|
@ -318,3 +313,19 @@
|
|||
- ${JOB_FOLDER}/results
|
||||
reports:
|
||||
junit: ${JOB_FOLDER}/results/junit.xml
|
||||
|
||||
.b2c-test-vk:
|
||||
extends:
|
||||
- .use-debian/x86_test-vk
|
||||
- .b2c-test
|
||||
needs:
|
||||
- debian/x86_test-vk
|
||||
- debian-testing
|
||||
|
||||
.b2c-test-gl:
|
||||
extends:
|
||||
- .use-debian/x86_test-gl
|
||||
- .b2c-test
|
||||
needs:
|
||||
- debian/x86_test-gl
|
||||
- debian-testing
|
||||
|
|
|
@ -37,10 +37,15 @@ radv_stoney_vkcts:amd64:
|
|||
ACO_DEBUG: validateir,validatera
|
||||
MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
|
||||
|
||||
.b2c-test-radv:
|
||||
.b2c-test-radv-vk:
|
||||
extends:
|
||||
- .test-radv
|
||||
- .b2c-test
|
||||
- .b2c-test-vk
|
||||
|
||||
.b2c-test-radv-gl:
|
||||
extends:
|
||||
- .test-radv
|
||||
- .b2c-test-gl
|
||||
|
||||
############### VKCTS tests ###############
|
||||
|
||||
|
@ -50,7 +55,7 @@ radv_stoney_vkcts:amd64:
|
|||
# So parallel: 2 and DEQP_FRACTION: 5 would imply running 1/10th of the suite.
|
||||
.vkcts-test-valve:
|
||||
extends:
|
||||
- .b2c-test-radv
|
||||
- .b2c-test-radv-vk
|
||||
# Keep all the VKCTS jobs as manual trigger jobs for now, until we
|
||||
# have enough resources to meet the throughput requirements for
|
||||
# automatic pre-merge in the Mesa CI.
|
||||
|
|
Loading…
Reference in New Issue