ci/deqp: control the GLES release independently of GL

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

.gitlab-ci/container/build-deqp.sh

@@ -13,9 +13,11 @@ set -ex -o pipefail
 
 DEQP_VK_VERSION=1.3.7.0
 
-# FIXME: this should be a GL release instead
+# FIXME: these should be GL & GLES releases instead
 #DEQP_GL_VERSION=4.6.3.3
 DEQP_GL_VERSION=1.3.7.0
+#DEQP_GLES_VERSION=3.2.9.3
+DEQP_GLES_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
@@ -75,6 +77,21 @@ if [ "${DEQP_TARGET}" = 'android' ]; then
   )
 fi
 
+# shellcheck disable=SC2034
+gles_cts_commits_to_backport=(
+)
+
+# shellcheck disable=SC2034
+gles_cts_patch_files=(
+)
+
+if [ "${DEQP_TARGET}" = 'android' ]; then
+  gles_cts_patch_files+=(
+    build-deqp_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
 
 ### Careful editing anything below this line
 
@@ -85,9 +102,11 @@ 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
+  # FIXME: these should be GL & GLES releases instead
   #GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";;
   GL) DEQP_VERSION="vulkan-cts-$DEQP_GL_VERSION";;
+  #GLES) DEQP_VERSION="opengl-es-cts-$DEQP_GLES_VERSION";;
+  GLES) DEQP_VERSION="vulkan-cts-$DEQP_GLES_VERSION";;
 esac
 
 git clone \
@@ -135,7 +154,7 @@ popd
 
 pushd /deqp
 
-if [ "${DEQP_API}" = 'GL' ]; then
+if [ "${DEQP_API}" = 'GLES' ]; then
   if [ "${DEQP_TARGET}" = 'android' ]; then
     cmake -S /VK-GL-CTS -B . -G Ninja \
         -DDEQP_TARGET=android \
@@ -181,6 +200,8 @@ case "${DEQP_API}" in
     ;;
   GL)
     deqp_build_targets+=(glcts)
+    ;;
+  GLES)
     deqp_build_targets+=(deqp-gles{2,3,31})
     ;;
 esac
@@ -244,6 +265,8 @@ if [ "${DEQP_API}" = 'VK' ]; then
 fi
 if [ "${DEQP_API}" = 'GL' ]; then
   ${STRIP_CMD:-strip} external/openglcts/modules/glcts
+fi
+if [ "${DEQP_API}" = 'GLES' ]; then
   ${STRIP_CMD:-strip} modules/*/deqp-*
 fi
 du -sh ./*

.gitlab-ci/container/debian/x86_64_test-android.sh

@@ -54,6 +54,11 @@ DEQP_TARGET="android" \
 EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
 . .gitlab-ci/container/build-deqp.sh
 
+DEQP_API=GLES \
+DEQP_TARGET="android" \
+EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
+. .gitlab-ci/container/build-deqp.sh
+
 ############### Downloading Cuttlefish resources ...
 
 CUTTLEFISH_VERSION=9082637   # Chosen from https://ci.android.com/builds/branches/aosp-master/grid?

.gitlab-ci/container/debian/x86_64_test-gl.sh

@@ -81,6 +81,10 @@ DEQP_API=GL \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh
 
+DEQP_API=GLES \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
 ############### Build apitrace
 
 . .gitlab-ci/container/build-apitrace.sh

.gitlab-ci/container/lava_build.sh

@@ -276,6 +276,10 @@ DEQP_API=GL \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh
 
+DEQP_API=GLES \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
 DEQP_API=VK \
 DEQP_TARGET=default \
 . .gitlab-ci/container/build-deqp.sh

.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-split-gl"
-   DEBIAN_X86_64_TEST_GL_TAG: "20240301-split-gl"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240301-split-gles"
+   DEBIAN_X86_64_TEST_GL_TAG: "20240301-split-gles"
    DEBIAN_X86_64_TEST_VK_TAG: "20240301-split-gl"
-   KERNEL_ROOTFS_TAG: "20240301-split-gl"
+   KERNEL_ROOTFS_TAG: "20240301-split-gles"
 
    ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5"
    ALPINE_X86_64_LAVA_SSH_TAG: "20230626-v1"