ci/android: Update Cuttlefish image

Main changes:
- Use hwcomposer=drm for venus_guest_angle instead of ranchu
- Cherry pick an upstream change in external/minigbm
  https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/6691931

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35786>
This commit is contained in:
Valentine Burley
2025-07-01 14:14:49 +02:00
committed by Marge Bot
parent 26bd1df9bf
commit 5ac532bfc7
4 changed files with 2 additions and 10 deletions

View File

@@ -149,7 +149,7 @@ debian/s390x_build:
LLVM_VERSION: &debian-android-llvm 19 LLVM_VERSION: &debian-android-llvm 19
CUTTLEFISH_PROJECT_PATH: ao2/aosp-manifest CUTTLEFISH_PROJECT_PATH: ao2/aosp-manifest
CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus
CUTTLEFISH_BUILD_NUMBER: 20250506.001 CUTTLEFISH_BUILD_NUMBER: 20250701.001
AOSP_KERNEL_PROJECT_PATH: ao2/aosp-kernel-manifest AOSP_KERNEL_PROJECT_PATH: ao2/aosp-kernel-manifest
AOSP_KERNEL_BUILD_VERSION_TAGS: common-android14-6.1-venus AOSP_KERNEL_BUILD_VERSION_TAGS: common-android14-6.1-venus
AOSP_KERNEL_BUILD_NUMBER: 20241107.001 AOSP_KERNEL_BUILD_NUMBER: 20241107.001

View File

@@ -23,7 +23,7 @@ variables:
DEBIAN_BUILD_TAG: "20250611-rust" DEBIAN_BUILD_TAG: "20250611-rust"
DEBIAN_TEST_ANDROID_TAG: "20250626-acts" DEBIAN_TEST_ANDROID_TAG: "20250701-cuttlefish"
DEBIAN_TEST_GL_TAG: "20250616-vkcts-main" DEBIAN_TEST_GL_TAG: "20250616-vkcts-main"
DEBIAN_TEST_VIDEO_TAG: "20250609-helper" DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
DEBIAN_TEST_VK_TAG: "20250619-vkd3d" DEBIAN_TEST_VK_TAG: "20250619-vkd3d"

View File

@@ -19,9 +19,3 @@ x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferVertexBuffer_BLOB x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferVertexBuffer_BLOB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuWrite_BLOB x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuWrite_BLOB
x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuRead_BLOB x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuRead_BLOB
# First test run details for dEQP: https://mesa.pages.freedesktop.org/-/mesa/-/jobs/79050820/artifacts/results/test_result.html
### Fail: vkd.mapMemory(device, mem, offset, size, flags, &amp;hostPtr): VK_ERROR_MEMORY_MAP_FAILED at vkMemUtil.cpp:326
x86_64 CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.suballocated.host_visible#import_twice
x86_64 CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.host_visible#import_twice

View File

@@ -1,2 +0,0 @@
ahb-dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.host_visible.import_twice,Fail
ahb-dEQP-VK.api.external.memory.android_hardware_buffer.suballocated.host_visible.import_twice,Fail