From f8e87fbf50a437a4178ec47d23c2a4352633d91e Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Wed, 9 Apr 2025 13:11:47 +0200 Subject: [PATCH] ci/amd: Convert to using the new container based rootfs Signed-off-by: Valentine Burley Part-of: --- src/amd/ci/gitlab-ci.yml | 14 +++++++------- src/amd/ci/radeonsi-raven-fails.txt | 3 +++ src/amd/ci/radeonsi-stoney-fails.txt | 2 ++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 1b6df1c9e56..b35317fd730 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -4,7 +4,7 @@ include: # Run five jobs in parallel each running 1/55th of the test suite radv-stoney-vkcts: extends: - - .lava-test-deqp:x86_64 + - .lava-x86_64-test-vk - .radv-stoney-test:x86_64 parallel: 5 variables: @@ -13,7 +13,7 @@ radv-stoney-vkcts: radv-stoney-angle: extends: - - .lava-test-deqp:x86_64 + - .lava-x86_64-test-gl - .radv-stoney-test:x86_64 - .test-angle variables: @@ -32,7 +32,7 @@ radv-stoney-angle-full: radeonsi-stoney-glcts-piglit: extends: - - .lava-test-deqp:x86_64 + - .lava-x86_64-test-gl - .radeonsi-stoney-test:x86_64 - .test-piglit parallel: 11 @@ -59,7 +59,7 @@ radeonsi-stoney-traces: radv-raven-vkcts: extends: - - .lava-test-deqp:x86_64 + - .lava-x86_64-test-vk - .radv-raven-test:x86_64 - .lava-asus-CM1400CXA-dalboz:x86_64 parallel: 9 @@ -69,7 +69,7 @@ radv-raven-vkcts: amd-raven-skqp: extends: - - .lava-test-deqp:x86_64 + - .lava-x86_64-test-gl - .amd-raven-test:x86_64 - .lava-hp-x360-14a-cb0001xx-zork:x86_64 variables: @@ -108,7 +108,7 @@ radv-raven-traces-restricted: radeonsi-raven-piglit: extends: - - .lava-test-deqp:x86_64 + - .lava-x86_64-test-gl - .radeonsi-raven-test:x86_64 - .test-piglit - .lava-lenovo-TPad-C13-Yoga-zork:x86_64 @@ -120,7 +120,7 @@ radeonsi-raven-piglit: # lower image opcodes to emulate CDNA compute devices radeonsi-raven-cdna-lower-image-piglit: extends: - - .lava-test-deqp:x86_64 + - .lava-x86_64-test-gl - .radeonsi-raven-test:x86_64 - .test-piglit - .lava-lenovo-TPad-C13-Yoga-zork:x86_64 diff --git a/src/amd/ci/radeonsi-raven-fails.txt b/src/amd/ci/radeonsi-raven-fails.txt index 3d7ea01c6eb..7d1af063cbc 100644 --- a/src/amd/ci/radeonsi-raven-fails.txt +++ b/src/amd/ci/radeonsi-raven-fails.txt @@ -38,3 +38,6 @@ spec@!opengl 1.1@line-smooth-stipple,Fail spec@arb_viewport_array@display-list,Fail # since transition XORG -> WESTON glx@glx_arb_sync_control@waitformsc,Fail + +# Since switching to test-gl container based rootfs +spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail diff --git a/src/amd/ci/radeonsi-stoney-fails.txt b/src/amd/ci/radeonsi-stoney-fails.txt index cea39fa696f..25eb4b922cc 100644 --- a/src/amd/ci/radeonsi-stoney-fails.txt +++ b/src/amd/ci/radeonsi-stoney-fails.txt @@ -151,3 +151,5 @@ KHR-GLES3.cull_distance.functional,Fail spec@ext_external_objects@vk-ping-pong-multi-sem,Fail spec@ext_external_objects@vk-ping-pong-single-sem,Crash +# Since switching to test-gl container based rootfs +spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail