From 4c6ce826af2bd633563ffd9f798d511c40805bd1 Mon Sep 17 00:00:00 2001
From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Date: Thu, 9 Apr 2020 18:40:38 +0300
Subject: [PATCH] gitlab-ci: Check the Mesa version used for tracie tests

Verify that the Mesa version used when running tracie tests is the
one that was built by CI, rather than any installed distro version.

Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Reviewed-by: Rohan Garg <rohan.garg@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3894>
---
 .gitlab-ci.yml                      | 2 +-
 .gitlab-ci/container/x86_test-vk.sh | 1 +
 .gitlab-ci/tracie-runner-gl.sh      | 5 +++++
 .gitlab-ci/tracie-runner-vk.sh      | 5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c221a9ca34f..c2b73bca927 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,7 +151,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-04-01-jflags"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-04-09"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 57966a6af4b..c88199b42bf 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -59,6 +59,7 @@ apt-get install -y --no-remove \
       python3-pil \
       python3-requests \
       python3-yaml \
+      vulkan-tools \
       wget \
       xauth \
       xvfb
diff --git a/.gitlab-ci/tracie-runner-gl.sh b/.gitlab-ci/tracie-runner-gl.sh
index f65d7abba3e..a12ce6bff39 100755
--- a/.gitlab-ci/tracie-runner-gl.sh
+++ b/.gitlab-ci/tracie-runner-gl.sh
@@ -25,4 +25,9 @@ export WAFFLE_PLATFORM=surfaceless_egl
 # Perform a self-test to ensure tracie is working properly.
 "$INSTALL/tracie/tests/test.sh"
 
+# Sanity check to ensure that our environment is sufficient to make our tests
+# run against the Mesa built by CI, rather than any installed distro version.
+MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')
+wflinfo --platform surfaceless_egl --api gles2 | grep "Mesa $MESA_VERSION\(\s\|$\)"
+
 python3 $INSTALL/tracie/tracie.py --file $INSTALL/traces.yml --device-name $DEVICE_NAME
diff --git a/.gitlab-ci/tracie-runner-vk.sh b/.gitlab-ci/tracie-runner-vk.sh
index a4f53505bcc..6f0c46fd415 100755
--- a/.gitlab-ci/tracie-runner-vk.sh
+++ b/.gitlab-ci/tracie-runner-vk.sh
@@ -23,6 +23,11 @@ export DXVK_STATE_CACHE=0
 # Perform a self-test to ensure tracie is working properly.
 "$INSTALL/tracie/tests/test.sh"
 
+# Sanity check to ensure that our environment is sufficient to make our tests
+# run against the Mesa built by CI, rather than any installed distro version.
+MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')
+vulkaninfo | grep "Mesa $MESA_VERSION\(\s\|$\)"
+
 ret=0
 
 # Run gfxreconstruct traces against the host's running X server (xvfb
-- 
2.30.2