mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 11:26:04 +08:00
2e96d4eefa
The Multi-ABI targets run a subset of Android tests but the target doesn't explicitly set the name of the Android emulator to run, so it was defaulting to Android 6 because the CI Android emulator runner script defaults to that. The latter is going change to be more explicit, so this needs to be explicit also. Pick-to: 6.6 6.5 Change-Id: Ifd5ddd5b5cf3b7a1b275f5a7b1252a21ae3165bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
55 lines
1.8 KiB
YAML
55 lines
1.8 KiB
YAML
Version: 2
|
|
Configurations:
|
|
-
|
|
Id: 'rhel_8.4_android_multi'
|
|
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
|
|
Target os: 'Android_ANY'
|
|
Target arch: 'multi'
|
|
Compiler: 'GCC'
|
|
Target compiler: 'Clang'
|
|
Platform dependency: [
|
|
'rhel-8.6',
|
|
'android-6-x86-on-linux',
|
|
'android-13-x86_64-on-linux'
|
|
]
|
|
Features: [
|
|
'Sccache',
|
|
'WarningsAreErrors',
|
|
'AndroidTestRun',
|
|
'MinimalAndroidMultiABITests',
|
|
'InstallDepsPerPlatformSubdir'
|
|
]
|
|
Environment variables: [
|
|
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6',
|
|
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
|
|
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
|
|
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
|
|
'ANDROID_EMULATOR=emulator_x86_api_23'
|
|
]
|
|
-
|
|
Id: 'rhel_8.8_android_multi'
|
|
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
|
|
Target os: 'Android_ANY'
|
|
Target arch: 'multi'
|
|
Compiler: 'GCC'
|
|
Target compiler: 'Clang'
|
|
Platform dependency: [
|
|
'rhel-8.8',
|
|
'android-6-RHEL-8.8-x86-on-linux',
|
|
'android-13-RHEL-8.8-x86_64-on-linux'
|
|
]
|
|
Features: [
|
|
'Sccache',
|
|
'WarningsAreErrors',
|
|
'AndroidTestRun',
|
|
'MinimalAndroidMultiABITests',
|
|
'InstallDepsPerPlatformSubdir'
|
|
]
|
|
Environment variables: [
|
|
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8',
|
|
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-RHEL-8.8-x86-on-linux',
|
|
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-RHEL-8.8-x86_64-on-linux',
|
|
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
|
|
'ANDROID_EMULATOR=emulator_x86_api_23'
|
|
]
|