From fc4c44b09d968348023b7ee112206d208b89e63d Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Wed, 29 Apr 2026 11:12:01 +0200 Subject: [PATCH] ci/android: Remove CtsDeqpTestCases from Android CTS CtsDeqpTestCases was originally added to run WSI tests on Android. This is now covered by the command-line dEQP executable, which produces comparable results and is much, much faster thanks to multithreading via deqp-runner. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-android-cts.sh | 1 - src/virtio/ci/android-angle-venus-anv-android-cts-include.txt | 3 --- src/virtio/ci/android-angle-venus-anv-android-cts-skips.txt | 4 ---- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 4efbc933a46..d7f3dfe2059 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: 2dfd3e288249e4776ef6866d34d344d4 + CONDITIONAL_BUILD_ANDROID_CTS_TAG: 363c33efa7f381a9be0d4c6af2dfaa1d CONDITIONAL_BUILD_ANGLE_TAG: e40de41a79653aa19fac70dc6289d8e9 CONDITIONAL_BUILD_CROSVM_TAG: 7edabf28bbd50e00558e3b0bb2d94255 CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b diff --git a/.gitlab-ci/container/build-android-cts.sh b/.gitlab-ci/container/build-android-cts.sh index c9eb710598b..bf3c26ea870 100644 --- a/.gitlab-ci/container/build-android-cts.sh +++ b/.gitlab-ci/container/build-android-cts.sh @@ -26,7 +26,6 @@ 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/src/virtio/ci/android-angle-venus-anv-android-cts-include.txt b/src/virtio/ci/android-angle-venus-anv-android-cts-include.txt index 8dd26e2fa0e..e4decd7adf1 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,6 +1,3 @@ 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 dfde3e825b5..b2959ceb6f1 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 @@ -10,10 +10,6 @@ x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkanAp ### no support for ABP 2021 x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testAndroidBaselineProfile2021Support -## Mainly for testing platform features. Skip as take too long. -x86_64 CtsDeqpTestCases dEQP-VK.wsi.android.incremental_present.* -x86_64 CtsDeqpTestCases dEQP-VK.wsi.android.shared_presentable_image.* - # Appears to cause crashes with Android 16 x86_64 CtsGraphicsTestCases android.graphics.cts.SetFrameRateTest#testFixedSource_NonSeamless_arr