aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-11-04 11:18:30 +0100
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2022-11-15 14:08:39 +0200
commit8f6cdc23be97bd14236d71c765187f53395af3f3 (patch)
tree26821666389b89e5c6d7a1cb2d52bfd1adcd031f /coin/platform_configs
parent2a7c08f591f613670fe2c4733992dd76230559c5 (diff)
Add Android Multi-ABI CI preset
Add the minimal test preset for Multi-ABI Qt for Android. Change-Id: Ic534daa5cea823b08b718f43ece637f9f9b375d9 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/cmake_platforms_target_android.yaml2
-rw-r--r--coin/platform_configs/linux_android_tests_multi_abi.yaml26
-rw-r--r--coin/platform_configs/qtbase.yaml3
3 files changed, 30 insertions, 1 deletions
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: []