From 1d902e33723c2151c8ea63ea52a965bfb0ad08b6 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 3 May 2025 13:56:33 +0200 Subject: [PATCH] amd/ci: split .ci-tron-test-amdgpu from .ci-tron-test-radv To be reused by the other ci-tron amdgpu jobs. Part-of: --- src/amd/ci/gitlab-ci-inc.yml | 6 +++++- src/amd/ci/gitlab-ci.yml | 1 + src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml index e2655ddd23e..7e8d0e4aa40 100644 --- a/src/amd/ci/gitlab-ci-inc.yml +++ b/src/amd/ci/gitlab-ci-inc.yml @@ -286,7 +286,12 @@ VK_DRIVER: radeon ############### CI-tron +.ci-tron-test-amdgpu: + variables: + CI_TRON_PATTERN__JOB_WARN__REGEX: '\*ERROR\* ring .* timeout' + .ci-tron-test-radv: + extends: .ci-tron-test-amdgpu variables: VK_DRIVER: radeon DRIVER_NAME: radv @@ -299,7 +304,6 @@ MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 # Enable ETC2 emulation on non-native platforms (RENOIR,RDNA+, GFX6-8 dGPUs) vk_require_etc2: 'true' - CI_TRON_PATTERN__JOB_WARN__REGEX: '\*ERROR\* ring .* timeout' CI_TRON__B2C_SWAP_SIZE: '16g' .ci-tron-test-radv-vk: diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 4fa8e826deb..b213d87c1ce 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -280,6 +280,7 @@ radv-vangogh-vkcts: radeonsi-vangogh-glcts-full: extends: - .ci-tron-x86_64-test-gl + - .ci-tron-test-amdgpu - .test-piglit - .vangogh-test-valve - .radeonsi-valve-manual-rules diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 15b1a873082..586be7c4e60 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -250,6 +250,7 @@ .radv-zink-test-valve: timeout: 30m extends: + - .ci-tron-test-amdgpu - .ci-tron-x86_64-test-gl - .zink-test - .test-piglit