From 0e80e831f83d9a13e282c830cea6aad40882f9c5 Mon Sep 17 00:00:00 2001 From: Ritesh Raj Sarraf Date: Tue, 30 Sep 2025 15:41:18 +0530 Subject: [PATCH] ci/android: Use prebuilt cuttlefish packages from ci-deb-repo Make use of the prebuilt cuttlefish packages from the Debian Trixie base. These packages are built and published to an apt repository under ci-deb-repo Signed-off-by: Ritesh Raj Sarraf Part-of: --- .../container/debian/x86_64_test-android.sh | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh index e6a268bd2f4..f012d0641b2 100755 --- a/.gitlab-ci/container/debian/x86_64_test-android.sh +++ b/.gitlab-ci/container/debian/x86_64_test-android.sh @@ -31,6 +31,8 @@ EPHEMERAL=( DEPS=( aapt + cuttlefish-base + cuttlefish-user iproute2 ) apt-get install -y --no-remove --no-install-recommends \ @@ -111,7 +113,7 @@ rm -rf /VK-GL-CTS ############### Downloading Cuttlefish resources ... -section_start cuttlefish "Downloading, building and installing Cuttlefish" +section_start cuttlefish "Downloading and setting up Cuttlefish" mkdir /cuttlefish pushd /cuttlefish @@ -135,24 +137,6 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ popd -############### Building and installing Debian package ... - -ANDROID_CUTTLEFISH_VERSION=v1.0.1 - -mkdir android-cuttlefish -pushd android-cuttlefish -git init -git remote add origin https://github.com/google/android-cuttlefish.git -git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION" -git checkout FETCH_HEAD - -./tools/buildutils/build_packages.sh - -apt-get install -y --allow-downgrades ./cuttlefish-base_*.deb ./cuttlefish-user_*.deb - -popd -rm -rf android-cuttlefish - addgroup --system kvm usermod -a -G kvm,cvdnetwork root