From 3c9cba1085fc144b30bd5c8894adfef567cee1b1 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 21 Jan 2024 18:10:21 +0000 Subject: [PATCH] ci/deqp: control the GL release independently of VK Part-of: --- .gitlab-ci/container/build-deqp.sh | 15 ++++++++++++++- .gitlab-ci/image-tags.yml | 8 ++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index bc85a5db7af..4151427dd88 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -11,7 +11,11 @@ set -ex -o pipefail -DEQP_VERSION=vulkan-cts-1.3.7.0 +DEQP_VK_VERSION=1.3.7.0 + +# FIXME: this should be a GL release instead +#DEQP_GL_VERSION=4.6.3.3 +DEQP_GL_VERSION=1.3.7.0 # Patches to VulkanCTS may come from commits in their repo (listed in # cts_commits_to_backport) or patch files stored in our repo (in the patch @@ -77,6 +81,15 @@ fi git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" + +# shellcheck disable=SC2153 +case "${DEQP_API}" in + VK) DEQP_VERSION="vulkan-cts-$DEQP_VK_VERSION";; + # FIXME: this should be a GL release instead + #GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";; + GL) DEQP_VERSION="vulkan-cts-$DEQP_GL_VERSION";; +esac + git clone \ https://github.com/KhronosGroup/VK-GL-CTS.git \ -b $DEQP_VERSION \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 96e553d17ad..fec2cd80b2c 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -24,10 +24,10 @@ 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: "20240301-cuttlefish" - DEBIAN_X86_64_TEST_GL_TAG: "20240223-piglit-2a" - DEBIAN_X86_64_TEST_VK_TAG: "20240223-piglit-2a" - KERNEL_ROOTFS_TAG: "20240301-mold" + DEBIAN_X86_64_TEST_ANDROID_TAG: "20240301-split-gl" + DEBIAN_X86_64_TEST_GL_TAG: "20240301-split-gl" + DEBIAN_X86_64_TEST_VK_TAG: "20240301-split-gl" + KERNEL_ROOTFS_TAG: "20240301-split-gl" ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5" ALPINE_X86_64_LAVA_SSH_TAG: "20230626-v1"