Commit 47383da9 authored by zhaoyangli's avatar zhaoyangli Committed by Commit Bot

[iOS][infra] Run tests in iOS14 runtimes on ios-simulator CQ builder

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

Bug: 1123108
Change-Id: I710c5fec38ea16975b3f0c3461175f83e1a66809
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2385780Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803321}
parent 4930e5e7
This diff is collapsed.
This diff is collapsed.
...@@ -5763,16 +5763,15 @@ ...@@ -5763,16 +5763,15 @@
# 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 are ios-simulator's 12.4 passing # The list of variants are 12.4 sims used to be on
# sims converted to 14.0, and 12.4 sims used to be on # ios-simulator and ios-simulator-full-configs.
# ios-simulator-full-configs.
'ios_simulator_noncq_tests': { 'ios_simulator_noncq_tests': {
'ios_common_tests': { 'ios_common_tests': {
'mixins': [ 'mixins': [
'xctest', 'xctest',
], ],
'variants': [ 'variants': [
'SIM_IPHONE_6S_14_0', 'SIM_IPHONE_6S_12_4',
] ]
}, },
'ios_eg2_tests': { 'ios_eg2_tests': {
...@@ -5780,24 +5779,15 @@ ...@@ -5780,24 +5779,15 @@
'variants': [ 'variants': [
'SIM_IPAD_AIR_2_12_4', 'SIM_IPAD_AIR_2_12_4',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
'SIM_IPHONE_6S_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_IPAD_AIR_2_12_4',
'SIM_IPHONE_6S_14_0', 'SIM_IPHONE_6S_12_4',
] ]
}, },
'ios_screen_size_dependent_tests': {
'mixins': [
'xctest',
],
'variants': [
'SIM_IPHONE_6S_14_0',
]
}
}, },
'ios_simulator_tests': { 'ios_simulator_tests': {
...@@ -5806,14 +5796,14 @@ ...@@ -5806,14 +5796,14 @@
'xctest', 'xctest',
], ],
'variants': [ 'variants': [
'SIM_IPHONE_6S_12_4', 'SIM_IPHONE_6S_14_0',
'SIM_IPHONE_6S_13_6', 'SIM_IPHONE_6S_13_6',
] ]
}, },
'ios_eg2_cq_tests': { 'ios_eg2_cq_tests': {
'mixins': ['xcode_parallelization'], 'mixins': ['xcode_parallelization'],
'variants': [ 'variants': [
'SIM_IPHONE_6S_12_4', 'SIM_IPHONE_6S_14_0',
'SIM_IPHONE_6S_13_6', 'SIM_IPHONE_6S_13_6',
] ]
}, },
...@@ -5825,7 +5815,11 @@ ...@@ -5825,7 +5815,11 @@
'SIM_IPHONE_6S_PLUS_13_6', 'SIM_IPHONE_6S_PLUS_13_6',
'SIM_IPHONE_6S_13_6', 'SIM_IPHONE_6S_13_6',
'SIM_IPHONE_SE_1ST_GEN_13_6', 'SIM_IPHONE_SE_1ST_GEN_13_6',
'SIM_IPAD_AIR_2_13_6' 'SIM_IPAD_AIR_2_13_6',
'SIM_IPHONE_6S_PLUS_14_0',
'SIM_IPHONE_6S_14_0',
'SIM_IPHONE_SE_1ST_GEN_14_0',
'SIM_IPAD_AIR_2_14_0'
] ]
} }
}, },
......
...@@ -217,6 +217,15 @@ ...@@ -217,6 +217,15 @@
], ],
'identifier': 'iPhone SE (1st generation) 13.6' 'identifier': 'iPhone SE (1st generation) 13.6'
}, },
'SIM_IPHONE_SE_1ST_GEN_14_0': {
'args': [
'--platform',
'iPhone SE (1st generation)',
'--version',
'14.0',
],
'identifier': 'iPhone SE (1st generation) 14.0'
},
'SIM_IPHONE_X_12_4': { 'SIM_IPHONE_X_12_4': {
'args': [ 'args': [
'--platform', '--platform',
......
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