From 10602f2dddd47a295b5addd08eb5f36abfc16037 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 7 Jul 2025 08:20:19 -0400
Subject: [PATCH] ci: bump VVL to 1.4.322ish

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35791>
---
 .gitlab-ci/container/build-vulkan-validation.sh | 9 +++++++--
 .gitlab-ci/image-tags.yml                       | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/container/build-vulkan-validation.sh b/.gitlab-ci/container/build-vulkan-validation.sh
index 3ab11e141c5..215d82c72f0 100644
--- a/.gitlab-ci/container/build-vulkan-validation.sh
+++ b/.gitlab-ci/container/build-vulkan-validation.sh
@@ -8,10 +8,15 @@ set -uex
 
 uncollapsed_section_start vulkan-validation "Building Vulkan validation layers"
 
-VALIDATION_TAG="snapshot-2025wk15"
+VALIDATION_TAG="bfcd034f1485b533b0fd7a14b79b6ce146369665"
 
-git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
+mkdir Vulkan-ValidationLayers
 pushd Vulkan-ValidationLayers
+git init
+git remote add origin https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
+git fetch --depth 1 origin "$VALIDATION_TAG"
+git checkout FETCH_HEAD
+
 # we don't need to build SPIRV-Tools tools
 sed -i scripts/known_good.json -e 's/SPIRV_SKIP_EXECUTABLES=OFF/SPIRV_SKIP_EXECUTABLES=ON/'
 python3 scripts/update_deps.py --dir external --config release --generator Ninja --optional tests
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 3e29dad23c2..8ef0103d3ba 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -24,7 +24,7 @@ variables:
   DEBIAN_BUILD_TAG: "20250710-libwayland"
 
   DEBIAN_TEST_ANDROID_TAG: "20250714-vkcts"
-  DEBIAN_TEST_GL_TAG: "20250714-vkcts"
+  DEBIAN_TEST_GL_TAG: "20250717-vvl"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
   DEBIAN_TEST_VK_TAG: "20250714-vkcts"