ci/android: Remove platform-tools from test-android container

Cuttlefish comes with the required tools (under /cuttlefish/bin),
downloading platform-tools isn't necessary.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34320>
This commit is contained in:
Valentine Burley
2025-04-01 13:27:43 +02:00
committed by Marge Bot
parent 70f10dc327
commit 9d11a8304e
3 changed files with 2 additions and 9 deletions

View File

@@ -2,8 +2,6 @@
# shellcheck disable=SC2086 # we want word splitting
# shellcheck disable=SC1091 # paths only become valid at runtime
export PATH=/android-tools/platform-tools:$PATH
# Set default ADB command if not set already
: "${ADB:=adb}"

View File

@@ -138,7 +138,7 @@ rm -rf android-cuttlefish
addgroup --system kvm
usermod -a -G kvm,cvdnetwork root
############### Downloading Android CTS - Build tools - Platform tools ...
############### Downloading Android CTS tools
ANDROID_CTS_VERSION="${ANDROID_VERSION}_r1"
ANDROID_CTS_DEVICE_ARCH="x86"
@@ -163,11 +163,6 @@ unzip "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
rm "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
mv "android-$ANDROID_VERSION" build-tools
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-o "platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip" "https://dl.google.com/android/repository/platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip"
unzip "platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip"
rm "platform-tools_r${ANDROID_SDK_VERSION}.0.0-linux.zip"
popd
############### Uninstall the build software

View File

@@ -37,7 +37,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: "20250330-angle-1b"
DEBIAN_TEST_ANDROID_TAG: "20250401-plattools"
DEBIAN_TEST_GL_TAG: "20250330-angle-1b"
DEBIAN_TEST_VK_TAG: "20250327-apitrace"
KERNEL_ROOTFS_TAG: "20250402-overlay"