fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 17:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: print deqp version in the job log

Browse source 
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>
This commit is contained in:
Eric Engestrom 2023-03-09 11:33:53 +00:00 • committed by Marge Bot
parent 8b9677a4f4
commit 6387c17504
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/container/build-deqp.sh
View file

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

2
.gitlab-ci/deqp-runner.sh
View file

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

8
.gitlab-ci/image-tags.yml
View file

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