ci: Add test-android container for arm64
Introduce the arm64 counterpart of the debian/x86_64_test-android container/rootfs. Building Android arm64 targets is complicated by the fact that Google only provides the Android NDK for x86_64 hosts. Because of this, the debian/arm64_test-android setup is split into two parts: debian/arm64_test-android-tools Despite the name, this is a native x86_64 container used to build ANGLE, dEQP, and deqp-runner for Android arm64 targets. The resulting artifacts are uploaded to S3 and later consumed by the final image. debian/arm64_test-android This is the final arm64 container/rootfs. It downloads the previously built tools and installs the Cuttlefish Debian package. The Cuttlefish guest image and additional host tools are not included in this image. It is currently only used in LAVA, where Cuttlefish artifacts can be deployed separately and kept cached across container rebuilds. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39993>
This commit is contained in:
Valentine Burley
parent
e26a8f0e76
commit
3d00926006
5 changed files with 224 additions and 74 deletions
7
.gitlab-ci/container/debian/arm64_test-android-tools.sh
Executable file
7
.gitlab-ci/container/debian/arm64_test-android-tools.sh
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
ANDROID_ARCH=arm64 \
|
||||
BUILD_CONTAINER=true \
|
||||
TEST_CONTAINER=false \
|
||||
DEBIAN_ARCH=amd64 \
|
||||
. .gitlab-ci/container/debian/test-android.sh
|
||||
7
.gitlab-ci/container/debian/arm64_test-android.sh
Executable file
7
.gitlab-ci/container/debian/arm64_test-android.sh
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
ANDROID_ARCH=arm64 \
|
||||
BUILD_CONTAINER=false \
|
||||
TEST_CONTAINER=true \
|
||||
DEBIAN_ARCH=arm64 \
|
||||
. .gitlab-ci/container/debian/test-android.sh
|
||||
|
|
@ -527,6 +527,51 @@ debian/arm64_test-vk:
|
|||
- job: debian/arm64_test-vk
|
||||
optional: true
|
||||
|
||||
# Debian-based x86_64 builder for Android test tools.
|
||||
# ANGLE, dEQP, and deqp-runner are built here since Google does not provide
|
||||
# an arm64 NDK. Artifacts are then copied into the arm64 test image.
|
||||
debian/arm64_test-android-tools:
|
||||
extends:
|
||||
- .android-variables
|
||||
- .use-debian/x86_64_test-base # NOT a mistake!
|
||||
- .container-builds-android
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-arm64_test-android ${DEBIAN_TEST_ANDROID_TAG}
|
||||
|
||||
# Debian based arm64 test image for Android
|
||||
debian/arm64_test-android:
|
||||
tags:
|
||||
- $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
|
||||
extends:
|
||||
- .android-variables
|
||||
- .use-debian/arm64_test-base
|
||||
- .container-builds-android
|
||||
- .export-container
|
||||
variables:
|
||||
MESA_IMAGE_TAG: *debian-arm64_test-android
|
||||
needs:
|
||||
- !reference [.use-debian/arm64_test-base, needs]
|
||||
- job: debian/arm64_test-android-tools
|
||||
optional: true
|
||||
|
||||
.use-debian/arm64_test-android:
|
||||
tags:
|
||||
- $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
|
||||
extends:
|
||||
- .android-variables
|
||||
- .set-image-base-tag
|
||||
variables:
|
||||
MESA_BASE_TAG: *debian-arm64_test-base
|
||||
MESA_IMAGE_PATH: "debian/arm64_test-android"
|
||||
MESA_IMAGE_TAG: *debian-arm64_test-android
|
||||
needs:
|
||||
- job: sanity
|
||||
optional: true
|
||||
- job: debian/arm64_test-android
|
||||
optional: true
|
||||
- job: debian/arm64_test-android-tools
|
||||
optional: true
|
||||
|
||||
# x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing
|
||||
.debian/baremetal_arm_test:
|
||||
extends:
|
||||
|
|
|
|||
|
|
@ -16,24 +16,60 @@ section_start debian_setup "Base Debian system setup"
|
|||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
# Ephemeral packages (installed for this script and removed again at the end)
|
||||
EPHEMERAL=(
|
||||
build-essential:native
|
||||
ccache
|
||||
cmake
|
||||
config-package-dev
|
||||
debhelper-compat
|
||||
dpkg-dev
|
||||
ninja-build
|
||||
unzip
|
||||
)
|
||||
# Google provides Android NDK for x86_64 hosts only; there is no arm64-native NDK for Linux.
|
||||
# Thus, we must cross-compile arm64 test tools on x86_64 runners.
|
||||
|
||||
# Container Variants Overview:
|
||||
# - x86_64_test-android: Comprehensive environment for x86_64 testing.
|
||||
# - arm64_test-android-tools: Used to cross-compile arm64 binaries (dEQP, ANGLE, etc)
|
||||
# on x86_64 runners because the Android NDK only provides x86_64 host binaries.
|
||||
# - arm64_test-android: Fetches components built by the 'tools' container to run
|
||||
# tests on arm64 devices where full builds are unsupported.
|
||||
#
|
||||
# | Component | x86_64_test-android | arm64_test-android-tools | arm64_test-android |
|
||||
# | :------------------: | :-----------------: | :----------------------: | :----------------: |
|
||||
# | Runner arch | x86_64 | x86_64 | arm64 |
|
||||
# | Android NDK | ✔ | ✔ | |
|
||||
# | ANGLE / dEQP | ✔ (Built) | ✔ (Built) | ✔ (Downloaded) |
|
||||
# | eglinfo / vulkaninfo | ✔ | | ✔ |
|
||||
# | Cuttlefish / CTS | ✔ (Included) | | (LAVA overlay) |
|
||||
# | Runtime Deps (AAPT) | ✔ | | ✔ |
|
||||
#
|
||||
# | Logic Variable | x86_64_test-android | arm64_test-android-tools | arm64_test-android |
|
||||
# | :------------------: | :-----------------: | :----------------------: | :----------------: |
|
||||
# | BUILD_CONTAINER | ✔ | ✔ | |
|
||||
# | TEST_CONTAINER | ✔ | | ✔ |
|
||||
|
||||
if "${BUILD_CONTAINER}"; then
|
||||
# Ephemeral packages (installed for this script and removed again at the end)
|
||||
EPHEMERAL=(
|
||||
binutils-aarch64-linux-gnu
|
||||
build-essential:native
|
||||
ccache
|
||||
cmake
|
||||
config-package-dev
|
||||
debhelper-compat
|
||||
dpkg-dev
|
||||
ninja-build
|
||||
unzip
|
||||
)
|
||||
else
|
||||
# We only need the build tools in build containers
|
||||
EPHEMERAL=()
|
||||
fi
|
||||
|
||||
if "${TEST_CONTAINER}"; then
|
||||
# We only need the Cuttlefish runtime dependencies in test containers
|
||||
DEPS=(
|
||||
aapt
|
||||
cuttlefish-base
|
||||
cuttlefish-user
|
||||
iproute2
|
||||
)
|
||||
else
|
||||
DEPS=()
|
||||
fi
|
||||
|
||||
DEPS=(
|
||||
aapt
|
||||
cuttlefish-base
|
||||
cuttlefish-user
|
||||
iproute2
|
||||
)
|
||||
apt-get install -y --no-remove --no-install-recommends \
|
||||
"${DEPS[@]}" "${EPHEMERAL[@]}"
|
||||
|
||||
|
|
@ -49,106 +85,159 @@ if [ "${ANDROID_ARCH}" = "x86_64" ]; then
|
|||
export ANGLE_ARCH=x64
|
||||
fi
|
||||
|
||||
if [ "${ANDROID_ARCH}" = "arm64" ]; then
|
||||
export RUST_TARGET=aarch64-linux-android
|
||||
export ANDROID_ABI=arm64-v8a
|
||||
export ANGLE_ARCH=arm64
|
||||
export STRIP_CMD=aarch64-linux-gnu-strip
|
||||
fi
|
||||
|
||||
############### Downloading Android tools
|
||||
|
||||
section_start android-tools "Downloading Android tools"
|
||||
|
||||
mkdir /android-tools
|
||||
pushd /android-tools
|
||||
# Download pre-built Android utility binaries (eglinfo, vulkaninfo) for test environments
|
||||
if "${TEST_CONTAINER}"; then
|
||||
mkdir /android-tools
|
||||
pushd /android-tools
|
||||
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-o eglinfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/eglinfo-android-${ANDROID_ARCH}"
|
||||
chmod +x eglinfo
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-o eglinfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/eglinfo-android-${ANDROID_ARCH}"
|
||||
chmod +x eglinfo
|
||||
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-${ANDROID_ARCH}"
|
||||
chmod +x vulkaninfo
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-${ANDROID_ARCH}"
|
||||
chmod +x vulkaninfo
|
||||
|
||||
popd
|
||||
popd
|
||||
fi
|
||||
|
||||
# Fetch cross-compiled test tools (ANGLE, dEQP) for the arm64 runtime.
|
||||
# These were built in the 'tools' container due to NDK host limitations.
|
||||
if ! "${BUILD_CONTAINER}"; then
|
||||
curl-with-retry -O "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${DEBIAN_TEST_ANDROID_TAG}/android-tools-arm64.tar.zst"
|
||||
tar --zstd -xf android-tools-arm64.tar.zst -C /
|
||||
rm android-tools-arm64.tar.zst
|
||||
fi
|
||||
|
||||
section_end android-tools
|
||||
|
||||
############### Downloading NDK for native builds for the guest ...
|
||||
|
||||
section_start android-ndk "Downloading Android NDK"
|
||||
# Skip NDK setup and builds for test-only runtimes
|
||||
if "${BUILD_CONTAINER}"; then
|
||||
section_start android-ndk "Downloading Android NDK"
|
||||
|
||||
# Fetch the NDK and extract just the toolchain we want.
|
||||
ndk="android-ndk-${ANDROID_NDK_VERSION}"
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
|
||||
unzip -q -d / "$ndk.zip"
|
||||
rm "$ndk.zip"
|
||||
# Fetch the NDK and extract just the toolchain we want.
|
||||
ndk="android-ndk-${ANDROID_NDK_VERSION}"
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
|
||||
unzip -q -d / "$ndk.zip"
|
||||
rm "$ndk.zip"
|
||||
|
||||
section_end android-ndk
|
||||
section_end android-ndk
|
||||
|
||||
############### Build ANGLE
|
||||
############### Build ANGLE
|
||||
|
||||
ANGLE_TARGET=android \
|
||||
. .gitlab-ci/container/build-angle.sh
|
||||
ANGLE_TARGET=android \
|
||||
. .gitlab-ci/container/build-angle.sh
|
||||
|
||||
############### Build dEQP runner
|
||||
############### Build dEQP runner
|
||||
|
||||
export ANDROID_NDK_HOME=/$ndk
|
||||
. .gitlab-ci/container/build-rust.sh test
|
||||
. .gitlab-ci/container/build-deqp-runner.sh
|
||||
export ANDROID_NDK_HOME=/$ndk
|
||||
. .gitlab-ci/container/build-rust.sh test
|
||||
. .gitlab-ci/container/build-deqp-runner.sh
|
||||
|
||||
# Properly uninstall rustup including cargo and init scripts on shells
|
||||
rustup self uninstall -y
|
||||
# Properly uninstall rustup including cargo and init scripts on shells
|
||||
rustup self uninstall -y
|
||||
|
||||
############### Build dEQP
|
||||
############### Build dEQP
|
||||
|
||||
DEQP_API=tools \
|
||||
DEQP_TARGET="android" \
|
||||
EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
DEQP_API=tools \
|
||||
DEQP_TARGET="android" \
|
||||
EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
|
||||
DEQP_API=GLES \
|
||||
DEQP_TARGET="android" \
|
||||
EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
DEQP_API=GLES \
|
||||
DEQP_TARGET="android" \
|
||||
EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
|
||||
DEQP_API=VK \
|
||||
DEQP_TARGET="android" \
|
||||
EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
DEQP_API=VK \
|
||||
DEQP_TARGET="android" \
|
||||
EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
|
||||
rm -rf /VK-GL-CTS
|
||||
rm -rf /VK-GL-CTS
|
||||
fi
|
||||
|
||||
############### Downloading Cuttlefish resources ...
|
||||
|
||||
section_start cuttlefish "Downloading and setting up Cuttlefish"
|
||||
# We only need to download the Cuttlefish image and host tools for the shared runners on x86_64, otherwise they are deployed as LAVA overlays
|
||||
if [ "${ANDROID_ARCH}" = "x86_64" ]; then
|
||||
section_start cuttlefish "Downloading and setting up Cuttlefish"
|
||||
|
||||
mkdir /cuttlefish
|
||||
pushd /cuttlefish
|
||||
mkdir /cuttlefish
|
||||
pushd /cuttlefish
|
||||
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
|
||||
|
||||
tar --zstd -xvf aosp_cf_${ANDROID_ARCH}_only_phone-img-"$CUTTLEFISH_BUILD_NUMBER".tar.zst
|
||||
rm aosp_cf_${ANDROID_ARCH}_only_phone-img-"$CUTTLEFISH_BUILD_NUMBER".tar.zst
|
||||
ls -lhS ./*
|
||||
tar --zstd -xvf "aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
|
||||
rm "aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
|
||||
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package-${ANDROID_ARCH}.tar.zst"
|
||||
tar --zst -xvf cvd-host_package-${ANDROID_ARCH}.tar.zst
|
||||
rm cvd-host_package-${ANDROID_ARCH}.tar.zst
|
||||
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
|
||||
-O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package-${ANDROID_ARCH}.tar.zst"
|
||||
tar --zst -xvf "cvd-host_package-${ANDROID_ARCH}.tar.zst"
|
||||
rm "cvd-host_package-${ANDROID_ARCH}.tar.zst"
|
||||
|
||||
popd
|
||||
popd
|
||||
|
||||
addgroup --system kvm
|
||||
usermod -a -G kvm,cvdnetwork root
|
||||
section_end cuttlefish
|
||||
fi
|
||||
|
||||
section_end cuttlefish
|
||||
if "${TEST_CONTAINER}"; then
|
||||
addgroup --system kvm
|
||||
usermod -a -G kvm,cvdnetwork root
|
||||
fi
|
||||
|
||||
############### Downloading Android CTS
|
||||
|
||||
# We currently only have x86_64 CTS jobs
|
||||
if [ "${ANDROID_ARCH}" = "x86_64" ]; then
|
||||
. .gitlab-ci/container/build-android-cts.sh
|
||||
fi
|
||||
|
||||
############### Packaging arm64 tools for S3 upload
|
||||
|
||||
# Upload cross-compiled arm64 binaries to S3 for consumption by the test runtime container
|
||||
if ! "${TEST_CONTAINER}"; then
|
||||
section_start android-tools-arm64 "Uploading Android tools"
|
||||
|
||||
TOOL_DIRS=(
|
||||
/angle
|
||||
/deqp-gles
|
||||
/deqp-runner
|
||||
/deqp-tools
|
||||
/deqp-vk
|
||||
/mesa-ci-build-tag
|
||||
)
|
||||
|
||||
tar --zstd -cf android-tools-arm64.tar.zst "${TOOL_DIRS[@]}"
|
||||
|
||||
ci-fairy s3cp --token-file "${S3_JWT_FILE}" "android-tools-arm64.tar.zst" \
|
||||
"https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${DEBIAN_TEST_ANDROID_TAG}/android-tools-arm64.tar.zst"
|
||||
|
||||
section_end android-tools-arm64
|
||||
fi
|
||||
|
||||
############### Uninstall the build software
|
||||
|
||||
section_switch debian_cleanup "Cleaning up base Debian system"
|
||||
|
||||
rm -rf "/${ndk:?}"
|
||||
if "${BUILD_CONTAINER}"; then
|
||||
rm -rf "/${ndk:?}"
|
||||
fi
|
||||
|
||||
apt-get purge -y "${EPHEMERAL[@]}"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
ANDROID_ARCH=x86_64 \
|
||||
BUILD_CONTAINER=true \
|
||||
TEST_CONTAINER=true \
|
||||
DEBIAN_ARCH=amd64 \
|
||||
. .gitlab-ci/container/debian/test-android.sh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue