6 files changed, 14 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1099c9e7795..a165bf3a6f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -410,13 +410,13 @@ debian/x86_test-gl:
   variables:
     FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-2bb5d9ffd79c/linux-v5.13-rc5-for-mesa-ci-2bb5d9ffd79c.tar.bz2"
-    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-09-01-piglit"
+    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-2021-09-17-deqp"
 
 # Debian 11 based x86 test image for VK
 debian/x86_test-vk:
   extends: .use-debian/x86_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-vk "2021-09-01-piglit"
+    MESA_IMAGE_TAG: &debian-x86_test-vk "2021-2021-09-17-deqp"
 
 # Debian 11 based ARM build image
 debian/arm_build:
@@ -465,7 +465,7 @@ fedora/x86_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-10-01-amlogic-kms"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-10-07-deqp"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
@@ -519,7 +519,7 @@ debian/arm_test:
     FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_TAG: &debian-arm_test "2021-09-11-etnaviv"
+    MESA_IMAGE_TAG: &debian-arm_test "2021-09-17-deqp"
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 .use-debian/arm_test:
diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index d0e72ad7209..616d504a35d 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -6,7 +6,7 @@ git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 git clone \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b vulkan-cts-1.2.7.0 \
+    -b vulkan-cts-1.2.7.1 \
     --depth 1 \
     /VK-GL-CTS
 pushd /VK-GL-CTS
diff --git a/src/freedreno/ci/deqp-freedreno-a630-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
index 5fee5b05b8d..f0f60a74b0e 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
@@ -63,7 +63,6 @@ dEQP-VK.api.info.image_format_properties.2d.optimal.g8_b8_r8_3plane_420_unorm,Fa
 dEQP-VK.api.info.image_format_properties.2d.optimal.g8_b8r8_2plane_420_unorm,Fail
 
 # Fails when TU_DEBUG=forcebin is set
-dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_single_buffer_geom,Fail
 dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail
 dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
 
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt
index 674cd301c15..26aaa123884 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt
+++ b/src/gallium/drivers/iris/ci/deqp-iris-glk-fails.txt
@@ -22,7 +22,10 @@ dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail
 
 KHR-GL46.get_texture_sub_image.errors_test,Fail
 KHR-GL46.get_texture_sub_image.functional_test,Fail
+
+# "Result is different than expected at index: 33 Expected value: 664128 Result value: 658538 "
 KHR-GL46.texture_buffer.texture_buffer_atomic_functions,Fail
+
 KHR-GL46.transform_feedback.capture_vertex_interleaved_test,Fail
 KHR-GL46.transform_feedback.capture_vertex_separate_test,Fail
 KHR-GL46.transform_feedback.discard_vertex_test,Fail
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-glk-flakes.txt b/src/gallium/drivers/iris/ci/deqp-iris-glk-flakes.txt
new file mode 100644
index 00000000000..05dc1fd4fbc
--- /dev/null
+++ b/src/gallium/drivers/iris/ci/deqp-iris-glk-flakes.txt
@@ -0,0 +1,2 @@
+KHR-GL46.texture_buffer.texture_buffer_atomic_functions
+KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions
diff --git a/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt b/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt
index ec6b1daa468..c38856e4fbf 100644
--- a/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt
+++ b/src/gallium/drivers/iris/ci/deqp-iris-whl-fails.txt
@@ -35,6 +35,8 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail
 dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail
 dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail
 
+KHR-GL46.direct_state_access.textures_storage_1d_rg8ui,Fail
+
 KHR-GL46.get_texture_sub_image.errors_test,Fail
 KHR-GL46.get_texture_sub_image.functional_test,Fail
 
@@ -49,5 +51,7 @@ KHR-GL46.transform_feedback.draw_xfb_stream_instanced_test,Crash
 KHR-GL46.transform_feedback.query_vertex_interleaved_test,Fail
 KHR-GL46.transform_feedback.query_vertex_separate_test,Fail
 
+KHR-GLES31.core.pixelstoragemodes.teximage2d.r8snorm.16_0,Fail
+
 # "Result is different than expected at index: 0 Expected value: 1606528 Result value: 0"
 KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions,Fail