Commit 70e38681 authored by zhaoyangli's avatar zhaoyangli Committed by Commit Bot

[iOS][infra] Run tests in iOS14 runtimes on ios-simulator-full-configs

Replicated iOS 13.6 form factors to iOS 14 in the full-configs CQ bot.
Moved iOS12 runtimes on full configs bot to ios-simulator-noncq for
capacity restrain.

Bug: 1123108
Change-Id: I34109ef9278b916de94457b12f4c247eac54d073
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382223Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802873}
parent 051e97a3
This diff is collapsed.
This diff is collapsed.
...@@ -5712,19 +5712,21 @@ ...@@ -5712,19 +5712,21 @@
'ios_eg2_tests': { 'ios_eg2_tests': {
'mixins': ['xcode_parallelization'], 'mixins': ['xcode_parallelization'],
'variants': [ 'variants': [
'SIM_IPAD_AIR_2_12_4',
'SIM_IPHONE_X_12_4',
'SIM_IPHONE_7_13_6', 'SIM_IPHONE_7_13_6',
'SIM_IPAD_AIR_2_13_6', 'SIM_IPAD_AIR_2_13_6',
'SIM_IPHONE_X_13_6', 'SIM_IPHONE_X_13_6',
'SIM_IPHONE_7_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPHONE_X_14_0',
] ]
}, },
'ios_eg2_cq_tests': { 'ios_eg2_cq_tests': {
'mixins': ['xcode_parallelization'], 'mixins': ['xcode_parallelization'],
'variants': [ 'variants': [
'SIM_IPAD_AIR_2_12_4',
'SIM_IPHONE_7_13_6', 'SIM_IPHONE_7_13_6',
'SIM_IPAD_AIR_2_13_6', 'SIM_IPAD_AIR_2_13_6',
'SIM_IPHONE_7_14_0',
'SIM_IPAD_AIR_2_14_0',
] ]
} }
}, },
...@@ -5764,9 +5766,9 @@ ...@@ -5764,9 +5766,9 @@
# and removes failing ones from ios14-sdk-simulator. # and removes failing ones from ios14-sdk-simulator.
# The result is test suites with certain tests removed, # The result is test suites with certain tests removed,
# identified by *_noncq. # identified by *_noncq.
# The list of variants to use is determined by # The list of variants are ios-simulator's 12.4 passing
# ios-simulator and ios-simulator-full config's 12.4 # sims converted to 14.0, and 12.4 sims used to be on
# passing sims, converted to 14.0 # ios-simulator-full-configs.
'ios_simulator_noncq_tests': { 'ios_simulator_noncq_tests': {
'ios_common_tests': { 'ios_common_tests': {
'mixins': [ 'mixins': [
...@@ -5779,17 +5781,16 @@ ...@@ -5779,17 +5781,16 @@
'ios_eg2_tests': { 'ios_eg2_tests': {
'mixins': ['xcode_parallelization'], 'mixins': ['xcode_parallelization'],
'variants': [ 'variants': [
'SIM_IPAD_AIR_2_12_4',
'SIM_IPHONE_X_12_4',
'SIM_IPHONE_6S_14_0', 'SIM_IPHONE_6S_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPHONE_X_14_0',
] ]
}, },
'ios_eg2_cq_tests': { 'ios_eg2_cq_tests': {
'mixins': ['xcode_parallelization'], 'mixins': ['xcode_parallelization'],
'variants': [ 'variants': [
'SIM_IPAD_AIR_2_12_4',
'SIM_IPHONE_6S_14_0', 'SIM_IPHONE_6S_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPHONE_X_14_0',
] ]
}, },
'ios_screen_size_dependent_tests': { 'ios_screen_size_dependent_tests': {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment