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>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c221a9ca34f968a6474ea4d570e955a52d86e6df..c2b73bca92709c9e7a613069032c36984134adf1 100644 (file)
--- 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 57966a6af4bc58aaba2884a1efb45f25468341ba..c88199b42bfaca2dcfecf6fdd4d0390af41ed25a 100644 (file)
--- 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 f65d7abba3e081b4ddfee56018191683341bbc40..a12ce6bff397a55b1265a4545248c39237495069 100755 (executable)
--- 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 a4f53505bcc4ce2a7955e44d1467550b95d328ef..6f0c46fd41562aa6b66f56b368c8d46d46702f46 100755 (executable)
--- 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