radeonsi/ci: Fix radeonsi-vangogh-glcts job definition

If the pre-merge job is derived from the nightly job, it inherits
`.no-auto-retry`, which prevents Marge from retrying the job on flakes.

Reversing the order in which the pre-merge and nightly jobs derive from
each other fixes this.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36928>
This commit is contained in:
Valentine Burley 2025-08-22 11:02:20 +02:00 committed by Marge Bot
parent fe54cfe403
commit a2e7fbc351

View file

@ -270,28 +270,29 @@ radv-vangogh-vkcts:
RADV_PERFTEST: transfer_queue,hic
CI_TRON_TIMEOUT__OVERALL__MINUTES: 89
radeonsi-vangogh-glcts-full:
radeonsi-vangogh-glcts:
extends:
- .ci-tron-x86_64-test-gl
- .ci-tron-test-amdgpu
- .test-piglit
- .vangogh-test-valve
- .radeonsi-valve-manual-rules
timeout: 90m
variables:
GPU_VERSION: radeonsi-vangogh
DEQP_SUITE: radeonsi-vangogh
CI_TRON_TIMEOUT__OVERALL__MINUTES: 89
radeonsi-vangogh-glcts:
extends:
- radeonsi-vangogh-glcts-full
- .radeonsi-valve-rules
timeout: 20m
variables:
GPU_VERSION: radeonsi-vangogh
DEQP_SUITE: radeonsi-vangogh
DEQP_FRACTION: 6
CI_TRON_TIMEOUT__OVERALL__MINUTES: 19
radeonsi-vangogh-glcts-full:
extends:
- radeonsi-vangogh-glcts
- .radeonsi-valve-manual-rules
timeout: 90m
variables:
DEQP_FRACTION: 1
CI_TRON_TIMEOUT__OVERALL__MINUTES: 89
radv-raphael-vkcts:
extends:
- .ci-tron-test-radv-vk