ci: Bump deqp to current vulkan-cts-1.2.5.1

This new version contains several fixes.

v2:
 - Bump lava kernel+rootfs tag (Eric)

v3:
 - Drop {x86,arm}_test-base tag bumps (Michel)

Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8990>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 133ca0c..16d08d5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -399,13 +399,13 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-gl "2021-02-08-container-reorg"
+    MESA_IMAGE_TAG: &x86_test-gl "2021-02-11-vkglcts-1.2.5.1"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-vk "2021-02-08-container-reorg"
+    MESA_IMAGE_TAG: &x86_test-vk "2021-02-11-vkglcts-1.2.5.1"
 
 # Debian 10 based ARM build image
 arm_build:
@@ -447,7 +447,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-02-10-zink"
+    MESA_IMAGE_TAG: &arm64_test "2021-02-11-vkglcts-1.2.5.1"
 
 .use-arm64_test:
   extends:
@@ -464,7 +464,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-02-10-zink"
+    MESA_IMAGE_TAG: &armhf_test "2021-02-11-vkglcts-1.2.5.1"
 
 .use-armhf_test:
   extends:

diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index a25df61..745eaf8 100644 (file)
--- 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.5.0 \
+    -b vulkan-cts-1.2.5.1 \
     --depth 1 \
     /VK-GL-CTS
 pushd /VK-GL-CTS

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 8da2855..4c76b72 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  MESA_LAVA_TAG: "2021-02-10-zink"
+  MESA_LAVA_TAG: "2021-02-11-vkglcts-1.2.5.1"
 
 .kernel+rootfs:
   stage: container-2