ci: print deqp version in the job log

This allows to easily verify which version was actually running in some
job, to notice if an image tag wasn't properly bumped, for instance.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21850>

diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index cce4f52..10d0d90 100644 (file)
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -110,6 +110,8 @@ if [ "${DEQP_TARGET}" = 'android' ]; then
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
 fi
 
+git -C /VK-GL-CTS describe --long > /deqp/version
+
 # Copy out the mustpass lists we want.
 mkdir /deqp/mustpass
 for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 3d5df0a..cf7b22d 100755 (executable)
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -161,6 +161,8 @@ fi
 
 uncollapsed_section_switch deqp "deqp: deqp-runner"
 
+echo "deqp $(cat /deqp/version)"
+
 set +e
 if [ -z "$DEQP_SUITE" ]; then
     deqp-runner \

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 6965749..67cae5d 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -7,7 +7,7 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "2023-10-06-crosvm"
+   DEBIAN_BASE_TAG: "2023-10-07-deqp-version"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
    DEBIAN_BUILD_TAG: "2023-09-30-shader-db"
@@ -21,9 +21,9 @@ variables:
    DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-09-18-deqp"
-   DEBIAN_X86_64_TEST_GL_TAG: "2023-09-18-deqp"
-   DEBIAN_X86_64_TEST_VK_TAG: "2023-09-18-deqp"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-10-07-deqp-version"
+   DEBIAN_X86_64_TEST_GL_TAG: "2023-10-07-deqp-version"
+   DEBIAN_X86_64_TEST_VK_TAG: "2023-10-07-deqp-version"
 
    ALPINE_X86_64_BUILD_TAG: "2023-10-04-ephemeral"
    ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"