mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 12:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci/deqp: control the GL release independently of VK

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27465>
This commit is contained in:
Eric Engestrom 2024-01-21 18:10:21 +00:00 committed by Marge Bot
parent c59f0ca97e
commit 3c9cba1085
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci/container/build-deqp.sh
View File

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

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

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