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

@@ -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:

.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

.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

.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