From dc1502af2e4e17e8eb82f0f20931602a808c75e3 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Wed, 21 May 2025 13:46:45 +0200
Subject: [PATCH] ci/android: use newer cuttlefish images

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35126>
---
 .gitlab-ci/container/debian/x86_64_test-android.sh | 14 +++++++-------
 .gitlab-ci/image-tags.yml                          |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
index ae82adf8de8..00924040e30 100755
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -113,22 +113,22 @@ section_start cuttlefish "Downloading, building and installing Cuttlefish"
 
 CUTTLEFISH_PROJECT_PATH=ao2/aosp-manifest
 CUTTLEFISH_BUILD_VERSION_TAGS=mesa-venus
-CUTTLEFISH_BUILD_NUMBER=20250215.001
+CUTTLEFISH_BUILD_NUMBER=20250506.001
 
 mkdir /cuttlefish
 pushd /cuttlefish
 
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip"
+  -o aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.tar.zst "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.tar.zst"
 
-unzip aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
-rm aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
+tar --zstd -xvf aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.tar.zst
+rm aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.tar.zst
 ls -lhS ./*
 
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o cvd-host_package.tar.gz "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package.tar.gz"
-tar -xzvf cvd-host_package.tar.gz
-rm cvd-host_package.tar.gz
+  -o cvd-host_package-x86_64.tar.zst "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package-x86_64.tar.zst"
+tar --zst -xvf cvd-host_package-x86_64.tar.zst
+rm cvd-host_package-x86_64.tar.zst
 
 AOSP_KERNEL_PROJECT_PATH=ao2/aosp-kernel-manifest
 AOSP_KERNEL_BUILD_VERSION_TAGS=common-android14-6.1-venus
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index a80a65b4cbb..eee8e9b9759 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,7 +23,7 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250515-aarch64"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250603-vkcts-main"
+  DEBIAN_TEST_ANDROID_TAG: "20250603-cf-img-2"
   DEBIAN_TEST_GL_TAG: "20250603-vkcts-main"
   DEBIAN_TEST_VIDEO_TAG: "20250503-fluster"
   DEBIAN_TEST_VK_TAG: "20250603-vkcts-main"