From e7e9ceceb3f0ca89b59b42a026d3985e14f53292 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 16 Dec 2024 13:52:51 +0100 Subject: [PATCH] anv/ci: Fix GPU_VERSION configuration for anv-jsl and anv-jsl-full The GPU_VERSION was incorrectly set to iris-jsl for these ANV jobs, causing mismatched expectations. Signed-off-by: Valentine Burley Part-of: --- src/intel/ci/anv-jsl-skips.txt | 4 ++++ src/intel/ci/gitlab-ci-inc.yml | 2 +- src/intel/ci/gitlab-ci.yml | 1 + src/intel/ci/iris-jsl-skips.txt | 4 ---- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 src/intel/ci/anv-jsl-skips.txt diff --git a/src/intel/ci/anv-jsl-skips.txt b/src/intel/ci/anv-jsl-skips.txt new file mode 100644 index 00000000000..6ad31f733c3 --- /dev/null +++ b/src/intel/ci/anv-jsl-skips.txt @@ -0,0 +1,4 @@ +dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic + +# Timed out https://gitlab.freedesktop.org/gallo/mesa/-/jobs/64257593 +dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap_map2 diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml index 24a8cbc938c..18010f81a99 100644 --- a/src/intel/ci/gitlab-ci-inc.yml +++ b/src/intel/ci/gitlab-ci-inc.yml @@ -203,7 +203,7 @@ DEVICE_TYPE: acer-cb317-1h-c3z6-dedede FARM: collabora FDO_CI_CONCURRENT: 3 - GPU_VERSION: iris-jsl + GPU_VERSION: anv-jsl HWCI_KERNEL_MODULES: i915 RUNNER_TAG: mesa-ci-x86-64-lava-acer-cb317-1h-c3z6-dedede diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index 6770d5ad4d4..896c7f24553 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -201,6 +201,7 @@ iris-jsl-deqp: - .iris-test variables: DEQP_SUITE: iris-jsl + GPU_VERSION: iris-jsl DEQP_FRACTION: 8 parallel: 2 diff --git a/src/intel/ci/iris-jsl-skips.txt b/src/intel/ci/iris-jsl-skips.txt index f6b1788ae3d..33ce41144c9 100644 --- a/src/intel/ci/iris-jsl-skips.txt +++ b/src/intel/ci/iris-jsl-skips.txt @@ -3,7 +3,3 @@ KHR-GL46.gpu_shader_fp64.fp64.varyings KHR-GL46.gpu_shader_fp64.builtin.inverse_dmat4 KHR-Single-GL46.enhanced_layouts.xfb_global_buffer KHR-Single-GL46.enhanced_layouts.xfb_override_qualifiers_with_api -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic - -# Timed out https://gitlab.freedesktop.org/gallo/mesa/-/jobs/64257593 -dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap_map2