fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 04:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/android: Remove custom kernel

Browse source 
The 'venus_guest_angle' mode now uses the cross-domain context type and
no longer requires a custom kernel.

The 'venus' mode also works with the stock Android 16 kernel.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39197>
This commit is contained in:
Valentine Burley 2026-01-06 15:15:34 +01:00 • committed by Marge Bot
parent 8cd82ce149
commit a8a8e9be14
4 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci/container/debian/gitlab-ci.yml
View file

@ -186,9 +186,6 @@ debian/s390x_build:
CUTTLEFISH_PROJECT_PATH: gfx-ci/android/aosp-manifest
CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus
CUTTLEFISH_BUILD_NUMBER: 20260108.001
AOSP_KERNEL_PROJECT_PATH: ao2/aosp-kernel-manifest
AOSP_KERNEL_BUILD_VERSION_TAGS: common-android14-6.1-venus
AOSP_KERNEL_BUILD_NUMBER: 20241107.001
# Android NDK cross-build image
debian/android_build:

5
.gitlab-ci/container/debian/x86_64_test-android.sh
View file

@ -130,11 +130,6 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
tar --zst -xvf cvd-host_package-x86_64.tar.zst
rm cvd-host_package-x86_64.tar.zst
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/bzImage"
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/initramfs.img"
popd
addgroup --system kvm

12
.gitlab-ci/cuttlefish-runner.sh
View file

@ -58,15 +58,6 @@ ulimit -n 32768
VSOCK_BASE=10000 # greater than all the default vsock ports
VSOCK_CID=$((VSOCK_BASE + (CI_JOB_ID & 0xfff)))
# Venus requires a custom kernel for now
CUSTOM_KERNEL_ARGS=""
if [ "$CUTTLEFISH_GPU_MODE" = "venus" ] || [ "$CUTTLEFISH_GPU_MODE" = "venus_guest_angle" ]; then
CUSTOM_KERNEL_ARGS="
-kernel_path=/cuttlefish/bzImage
-initramfs_path=/cuttlefish/initramfs.img
"
fi
HOME=/cuttlefish launch_cvd \
-daemon \
-verbosity=VERBOSE \
@ -80,8 +71,7 @@ HOME=/cuttlefish launch_cvd \
-report_anonymous_usage_stats=no \
-gpu_mode="$CUTTLEFISH_GPU_MODE" \
-cpus=${FDO_CI_CONCURRENT:-4} \
-memory_mb ${CUTTLEFISH_MEMORY:-4096} \
$CUSTOM_KERNEL_ARGS
-memory_mb ${CUTTLEFISH_MEMORY:-4096}
sleep 1

10
.gitlab-ci/lava/lava-submit.sh
View file

@ -113,16 +113,6 @@ if [ -n "${S3_ANDROID_ARTIFACT_NAME:-}" ]; then
--path="/cuttlefish"
--format=tar
--compression=zstd
- append-overlay
--name=android-kernel
--url="https://${S3_BASE_PATH}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/bzImage"
--path="/cuttlefish"
--format=file
- append-overlay
--name=android-initramfs
--url="https://${S3_BASE_PATH}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/initramfs.img"
--path="/cuttlefish"
--format=file
)
fi