From 8f6cdc23be97bd14236d71c765187f53395af3f3 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 4 Nov 2022 11:18:30 +0100 Subject: Add Android Multi-ABI CI preset Add the minimal test preset for Multi-ABI Qt for Android. Change-Id: Ic534daa5cea823b08b718f43ece637f9f9b375d9 Reviewed-by: Assam Boudjelthia --- .../cmake_platforms_target_android.yaml | 2 ++ .../linux_android_tests_multi_abi.yaml | 26 ++++++++++++++++++++++ coin/platform_configs/qtbase.yaml | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 coin/platform_configs/linux_android_tests_multi_abi.yaml (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 831341f8..382e3ca6 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -33,6 +33,7 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - + Id: 'RHEL-8.4-Android-x86' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' @@ -49,6 +50,7 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - + Id: 'RHEL-8.4-Android-x86_64' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml new file mode 100644 index 00000000..37498e6b --- /dev/null +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -0,0 +1,26 @@ +Version: 2 +Configurations: +- + Id: 'RHEL_Android_Multi' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: [ + 'RHEL-8.4-host', + 'RHEL-8.4-Android-x86', + 'RHEL-8.4-Android-x86_64' + ] + Features: [ + 'Sccache', + 'AndroidTestRun', + 'MinimalAndroidMultiABITests', + 'InstallDepsPerPlatformSubdir' + ] + Environment variables: [ + 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-host', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86_64', + 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"' + ] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 0e6cc0cb..025aea7d 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -5,6 +5,7 @@ Include: [ integrity.yaml, ios-tests.yaml, address_sanitizer_platforms.yaml, - cmake_platforms_target_android_12_insignificant.yaml + cmake_platforms_target_android_12_insignificant.yaml, + linux_android_tests_multi_abi.yaml ] Configurations: [] -- cgit v1.2.3