mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

ci: reuse dead .vkd3d-proton-test to make vkd3d less radv-specific 

Replace dead `script:` with `HWCI_TEST_SCRIPT`, and rename it to have
the `b2c-` prefix since it's no longer generic.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29170>
This commit is contained in:
Eric Engestrom 2024-05-13 17:23:57 +02:00 committed by Marge Bot
parent 68c09a00c8
commit a40345aaeb
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci/test/gitlab-ci.yml
View File

@ -123,14 +123,15 @@ python-test:
paths:
- results/
.vkd3d-proton-test:
.b2c-vkd3d-proton-test:
artifacts:
when: on_failure
name: "mesa_${CI_JOB_NAME}"
paths:
- results/vkd3d-proton.log
script:
- ./install/vkd3d-proton/run.sh
variables:
HWCI_TEST_SCRIPT: ./install/vkd3d-proton/run.sh
B2C_JOB_SUCCESS_REGEX: 'vkd3d-proton execution: SUCCESS\r$'
.piglit-test:
artifacts:

10
src/amd/ci/gitlab-ci-inc.yml
View File

@ -379,16 +379,10 @@
DEQP_VER: vk
############### vkd3d-proton
.vkd3d-test-valve:
extends:
- .b2c-test-radv-vk
variables:
B2C_JOB_SUCCESS_REGEX: 'vkd3d-proton execution: SUCCESS\r$'
HWCI_TEST_SCRIPT: ./install/vkd3d-proton/run.sh
.vkd3d-kabini-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .kabini-test-valve
- .radv-valve-manual-rules
variables:

24
src/amd/ci/gitlab-ci.yml
View File

@ -316,7 +316,8 @@ radv-fossils:
vkd3d-tahiti-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .tahiti-test-valve
- .radv-valve-manual-rules
variables:
@ -326,7 +327,8 @@ vkd3d-tahiti-valve:
vkd3d-polaris10-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .polaris10-test-valve-kws
- .radv-valve-manual-rules
variables:
@ -334,7 +336,8 @@ vkd3d-polaris10-valve:
vkd3d-vega10-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .vega10-test-valve
- .radv-valve-manual-rules
variables:
@ -342,7 +345,8 @@ vkd3d-vega10-valve:
vkd3d-renoir-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .renoir-test-valve
- .radv-valve-manual-rules
variables:
@ -350,7 +354,8 @@ vkd3d-renoir-valve:
vkd3d-navi10-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .navi10-test-valve-mupuf
- .radv-valve-manual-rules
variables:
@ -358,7 +363,8 @@ vkd3d-navi10-valve:
vkd3d-navi21-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .navi21-test-valve
- .radv-valve-manual-rules
variables:
@ -366,7 +372,8 @@ vkd3d-navi21-valve:
vkd3d-vangogh-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .vangogh-test-valve
- .radv-valve-manual-rules
variables:
@ -374,7 +381,8 @@ vkd3d-vangogh-valve:
vkd3d-navi31-valve:
extends:
- .vkd3d-test-valve
- .b2c-test-radv-vk
- .b2c-vkd3d-proton-test
- .navi31-test-valve
- .radv-valve-manual-rules
variables: