ci/skqp: update to the Android CTS 12.1_r5 version

Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22710>

diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index bbb81c9..4c03bcc 100755 (executable)
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -8,7 +8,7 @@
 # .gitlab-ci/image-tags.yml tags:
 # KERNEL_ROOTFS_TAG
 
-SKQP_BRANCH=android-cts-11.0_r7
+SKQP_BRANCH=android-cts-12.1_r5
 
 create_gn_args() {
     # gn can be configured to cross-compile skia and its tools

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index bd8be4a..a8de07b 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -21,7 +21,7 @@ variables:
 
    ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
    FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng"
-   KERNEL_ROOTFS_TAG: "2023-04-25-vvl"
+   KERNEL_ROOTFS_TAG: "2023-04-26-skqp-12.1-r5"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"