From 909f837ecfc56fdbcde622dd1df3c56888e12836 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Wed, 8 Jan 2025 10:10:56 +0100
Subject: [PATCH] ci/android: update CUTTLEFISH_BUILD_NUMBER

Update CUTTLEFISH_BUILD_NUMBER to use a cuttlefish image that has the
`mesa_swrast` GPU mode which uses llvmpipe for GL and lavapipe for
Vulkan.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33261>
---
 .gitlab-ci/container/debian/x86_64_test-android.sh | 2 +-
 .gitlab-ci/image-tags.yml                          | 2 +-
 src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index 1ce0f2c86fa..63181017c43 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -84,7 +84,7 @@ rm -rf /VK-GL-CTS
 
 CUTTLEFISH_PROJECT_PATH=ao2/aosp-manifest
 CUTTLEFISH_BUILD_VERSION_TAGS=mesa-venus
-CUTTLEFISH_BUILD_NUMBER=20241108.001
+CUTTLEFISH_BUILD_NUMBER=20250115.001
 
 mkdir /cuttlefish
 pushd /cuttlefish
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index e0abbd58ec3..5975666753c 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -27,7 +27,7 @@ variables:
    DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_TEST_ANDROID_TAG: "20250128-llvm19-up"
+   DEBIAN_TEST_ANDROID_TAG: "20250129-android"
    DEBIAN_TEST_GL_TAG: "20250128-llvm19-up"
    DEBIAN_TEST_VK_TAG: "20250128-llvm19-up"
    KERNEL_ROOTFS_TAG: "20250128-llvm19-up"
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 02e4536ceb9..25e61b31216 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -67,7 +67,7 @@ llvmpipe-deqp-asan:
     - .test-android
     - .llvmpipe-rules
   variables:
-    ANDROID_GPU_MODE: guest_swiftshader
+    ANDROID_GPU_MODE: mesa_swrast
     GPU_VERSION: llvmpipe
     DEQP_SUITE: android-llvmpipe
     # TODO: define DEQP_FRACTION?