From 5d539f1a30d044b0e63d0f9b271711a79ab9337b Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Tue, 11 Jun 2024 15:54:32 +0200 Subject: [PATCH] ci/android: get custom cuttlefish images from the S3 To test mesa on cuttlefish some special images tailored for upstream mesa are needed, in particular these images may set properties or add functionality that enable new use cases for upstream mesa on Android, like for instance using venus via the vulkan.virtio mesa driver. So instead of downloading the standard images from Google, get those custom images from s3.freedesktop.org. Reviewed-by: Eric Engestrom Part-of: --- .../container/debian/x86_64_test-android.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh index 6a1e602762e..a22c0d23a7e 100755 --- a/.gitlab-ci/container/debian/x86_64_test-android.sh +++ b/.gitlab-ci/container/debian/x86_64_test-android.sh @@ -78,19 +78,24 @@ rm -rf /VK-GL-CTS ############### Downloading Cuttlefish resources ... -CUTTLEFISH_VERSION=9082637 # Chosen from https://ci.android.com/builds/branches/aosp-master/grid? +CUTTLEFISH_PROJECT_PATH=ao2/aosp-manifest +CUTTLEFISH_BUILD_VERSION_TAGS=mesa-venus +CUTTLEFISH_BUILD_NUMBER=20241108.001 mkdir /cuttlefish pushd /cuttlefish curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - -o aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip https://ci.android.com/builds/submitted/$CUTTLEFISH_VERSION/aosp_cf_x86_64_phone-userdebug/latest/raw/aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip -unzip aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip -rm aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip + -o aosp_cf_x86_64_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_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip" + +unzip aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip +rm aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip ls -lhS ./* curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - https://ci.android.com/builds/submitted/$CUTTLEFISH_VERSION/aosp_cf_x86_64_phone-userdebug/latest/raw/cvd-host_package.tar.gz | tar -xzvf- + -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 popd