diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 706af230dc2..e4c6f81cb71 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,5 +1,5 @@ variables: - CONDITIONAL_BUILD_ANDROID_CTS_TAG: ac6224b62687b8dd529d91c1a013094b + CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7 CONDITIONAL_BUILD_ANGLE_TAG: f62910e55be46e37cc867d037e4a8121 CONDITIONAL_BUILD_CROSVM_TAG: 0f59350b1052bdbb28b65a832b494377 CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9 diff --git a/.gitlab-ci/container/build-android-cts.sh b/.gitlab-ci/container/build-android-cts.sh index da6f72803e9..a57227160dd 100644 --- a/.gitlab-ci/container/build-android-cts.sh +++ b/.gitlab-ci/container/build-android-cts.sh @@ -26,6 +26,7 @@ ci_tag_build_time_check "ANDROID_CTS_TAG" # This should be the union of all modules required by our CI jobs # Specific modules to run are selected via the ${GPU_VERSION}-android-cts-include.txt files ANDROID_CTS_MODULES=( + "CtsDeqpTestCases" "CtsGraphicsTestCases" "CtsNativeHardwareTestCases" "CtsSkQPTestCases" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 4f9360cf68e..1275e609491 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,7 +23,7 @@ variables: DEBIAN_BUILD_TAG: "20250611-rust" - DEBIAN_TEST_ANDROID_TAG: "20250626-cts-mod" + DEBIAN_TEST_ANDROID_TAG: "20250626-acts" DEBIAN_TEST_GL_TAG: "20250616-vkcts-main" DEBIAN_TEST_VIDEO_TAG: "20250609-helper" DEBIAN_TEST_VK_TAG: "20250619-vkd3d" diff --git a/src/virtio/ci/android-angle-venus-anv-android-cts-include.txt b/src/virtio/ci/android-angle-venus-anv-android-cts-include.txt index e4decd7adf1..8dd26e2fa0e 100644 --- a/src/virtio/ci/android-angle-venus-anv-android-cts-include.txt +++ b/src/virtio/ci/android-angle-venus-anv-android-cts-include.txt @@ -1,3 +1,6 @@ x86_64 CtsGraphicsTestCases x86_64 CtsNativeHardwareTestCases x86_64 CtsSkQPTestCases + +x86_64 CtsDeqpTestCases dEQP-VK.wsi.android.* +x86_64 CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.* diff --git a/src/virtio/ci/android-angle-venus-anv-android-cts-skips.txt b/src/virtio/ci/android-angle-venus-anv-android-cts-skips.txt index 72918b54936..f23640f8e0a 100644 --- a/src/virtio/ci/android-angle-venus-anv-android-cts-skips.txt +++ b/src/virtio/ci/android-angle-venus-anv-android-cts-skips.txt @@ -20,12 +20,8 @@ x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareB x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuWrite_BLOB x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuRead_BLOB -### org.junit.AssumptionViolatedException: AVIF is not supported on this device, skip this test. -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[0] -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[1] -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[2] -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[3] -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[4] -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[5] -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[6] -x86_64 CtsGraphicsTestCases android.graphics.cts.AImageDecoderTest#testDecode10BitAvif[7] +# 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, &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