From abb9ebed26cb03a82ce88642cf234ee23978f2e3 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 26 Jun 2025 17:29:57 +0200 Subject: [PATCH] ci/android: download S3_ANDROID_ARTIFACT_NAME in cuttlefish-runner.sh Downloading the android artifacts separately is really a peculiarity of cuttlefish jobs, where we need mesa artifacts for both the host and the guest. So move the separate download of android artifacts to cuttlefish-runner.sh This aligns with the .test-android definition being cuttlefish specific, and it also matches the original comment in that definition regarding S3_ANDROID_ARTIFACT_NAME. Part-of: --- .gitlab-ci/android-runner.sh | 7 ------- .gitlab-ci/cuttlefish-runner.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh index 3d3128c1ceb..a668739910d 100755 --- a/.gitlab-ci/android-runner.sh +++ b/.gitlab-ci/android-runner.sh @@ -59,13 +59,6 @@ get_gles_runtime_version get_vk_runtime_device_name get_vk_runtime_version -# download Android Mesa from S3 -curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst" -mkdir /mesa-android -tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst - -INSTALL="/mesa-android/install" - # replace libraries $ADB shell rm -f /vendor/lib64/libgallium_dri.so* diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index 046ec916eb5..6f4881ff759 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -88,6 +88,14 @@ sleep 1 popd +# download Android Mesa from S3 +curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst" +mkdir /mesa-android +tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst + +# shellcheck disable=SC2034 # used externally +INSTALL="/mesa-android/install" + # shellcheck disable=SC2034 # used externally ADB=adb