From a2e7fbc351806865c02b63ce972832bc5082c6f2 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Fri, 22 Aug 2025 11:02:20 +0200 Subject: [PATCH] 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 Part-of: --- src/amd/ci/gitlab-ci.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index de0c87e317a..920e40cbbc2 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -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