Commit b41c5080 authored by zhaoyangli's avatar zhaoyangli Committed by Commit Bot

[iOS][infra] Use iOS 14.2 runtime in iOS14-* builders.

These run on Xcode 12.2 and should use 14.2 simulator runtime.

Bug: 1132967
Change-Id: I344e4bd651da37792cf156e95cd55efafa68d816
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440201Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812825}
parent 160465b4
This diff is collapsed.
......@@ -5588,25 +5588,25 @@
'xctest',
],
'variants': [
'SIM_IPHONE_X_14_0',
'SIM_IPHONE_X_14_2',
],
},
'ios_eg2_tests': {
'mixins': ['xcode_parallelization'],
'variants': [
'SIM_IPHONE_X_14_0',
'SIM_IPHONE_7_14_0',
'SIM_IPAD_AIR_3RD_GEN_14_0',
'SIM_IPAD_6_GEN_14_0',
'SIM_IPHONE_X_14_2',
'SIM_IPHONE_7_14_2',
'SIM_IPAD_AIR_3RD_GEN_14_2',
'SIM_IPAD_6_GEN_14_2',
]
},
'ios_eg2_cq_tests': {
'mixins': ['xcode_parallelization'],
'variants': [
'SIM_IPHONE_7_14_0',
'SIM_IPHONE_X_14_0',
'SIM_IPAD_PRO_2ND_GEN_14_0',
'SIM_IPAD_6_GEN_14_0',
'SIM_IPHONE_7_14_2',
'SIM_IPHONE_X_14_2',
'SIM_IPAD_PRO_2ND_GEN_14_2',
'SIM_IPAD_6_GEN_14_2',
]
},
'ios_screen_size_dependent_tests': {
......@@ -5614,9 +5614,9 @@
'xctest',
],
'variants': [
'SIM_IPHONE_6S_PLUS_14_0',
'SIM_IPHONE_X_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPHONE_6S_PLUS_14_2',
'SIM_IPHONE_X_14_2',
'SIM_IPAD_AIR_2_14_2',
],
},
},
......@@ -5627,26 +5627,26 @@
'xctest',
],
'variants': [
# 14.0 Sims
'SIM_IPHONE_6S_14_0',
# 14.2 Sims
'SIM_IPHONE_6S_14_2',
],
},
'ios_eg2_tests': {
'mixins': ['xcode_parallelization'],
'variants': [
# 14.0 Sims
'SIM_IPHONE_7_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPHONE_X_14_0',
# 14.2 Sims
'SIM_IPHONE_7_14_2',
'SIM_IPAD_AIR_2_14_2',
'SIM_IPHONE_X_14_2',
]
},
'ios_eg2_cq_tests': {
'mixins': ['xcode_parallelization'],
'variants': [
# 14.0 Sims
'SIM_IPHONE_X_14_0',
'SIM_IPAD_AIR_2_14_0',
'SIM_IPAD_PRO_2ND_GEN_14_0',
# 14.2 Sims
'SIM_IPHONE_X_14_2',
'SIM_IPAD_AIR_2_14_2',
'SIM_IPAD_PRO_2ND_GEN_14_2',
]
},
'ios_screen_size_dependent_tests': {
......@@ -5654,9 +5654,9 @@
'xctest',
],
'variants': [
# 14.0 Sims
'SIM_IPHONE_6S_PLUS_14_0',
'SIM_IPHONE_6S_14_0',
# 14.2 Sims
'SIM_IPHONE_6S_PLUS_14_2',
'SIM_IPHONE_6S_14_2',
],
},
},
......
......@@ -89,34 +89,43 @@
],
'identifier': 'iPad Air 2 14.0'
},
'SIM_IPAD_AIR_3RD_GEN_14_0': {
'SIM_IPAD_AIR_2_14_2': {
'args': [
'--platform',
'iPad Air 2',
'--version',
'14.2'
],
'identifier': 'iPad Air 2 14.2'
},
'SIM_IPAD_AIR_3RD_GEN_14_2': {
'args': [
'--platform',
'iPad Air (3rd generation)',
'--version',
'14.0'
'14.2'
],
'identifier': 'iPad Air (3rd generation) 14.0'
'identifier': 'iPad Air (3rd generation) 14.2'
},
# In Xcode 12, "iPad Pro (12.9-inch)" requires a generation suffix in
# "platform" arg.
'SIM_IPAD_PRO_2ND_GEN_14_0': {
'SIM_IPAD_PRO_2ND_GEN_14_2': {
'args': [
'--platform',
'iPad Pro (12.9-inch) (2nd generation)',
'--version',
'14.0',
'14.2',
],
'identifier': 'iPad Pro (12.9-inch) (2nd generation) 14.0'
'identifier': 'iPad Pro (12.9-inch) (2nd generation) 14.2'
},
'SIM_IPAD_6_GEN_14_0': {
'SIM_IPAD_6_GEN_14_2': {
'args': [
'--platform',
'iPad (6th generation)',
'--version',
'14.0',
'14.2',
],
'identifier': 'iPad (6th generation) 14.0'
'identifier': 'iPad (6th generation) 14.2'
},
'SIM_IPHONE_6S_12_4': {
'args': [
......@@ -136,23 +145,23 @@
],
'identifier': 'iPhone 6s 13.6'
},
'SIM_IPHONE_6S_13_6': {
'SIM_IPHONE_6S_14_0': {
'args': [
'--platform',
'iPhone 6s',
'--version',
'13.6',
'14.0',
],
'identifier': 'iPhone 6s 13.6'
'identifier': 'iPhone 6s 14.0'
},
'SIM_IPHONE_6S_14_0': {
'SIM_IPHONE_6S_14_2': {
'args': [
'--platform',
'iPhone 6s',
'--version',
'14.0',
'14.2',
],
'identifier': 'iPhone 6s 14.0'
'identifier': 'iPhone 6s 14.2'
},
'SIM_IPHONE_6S_PLUS_13_6': {
'args': [
......@@ -181,6 +190,15 @@
],
'identifier': 'iPhone 6s Plus 14.0'
},
'SIM_IPHONE_6S_PLUS_14_2': {
'args': [
'--platform',
'iPhone 6s Plus',
'--version',
'14.2',
],
'identifier': 'iPhone 6s Plus 14.2'
},
'SIM_IPHONE_7_13_6': {
'args': [
'--platform',
......@@ -208,6 +226,15 @@
],
'identifier': 'iPhone 7 14.0'
},
'SIM_IPHONE_7_14_2': {
'args': [
'--platform',
'iPhone 7',
'--version',
'14.2',
],
'identifier': 'iPhone 7 14.2'
},
'SIM_IPHONE_SE_1ST_GEN_13_6': {
'args': [
'--platform',
......@@ -271,6 +298,15 @@
],
'identifier': 'iPhone X 14.0'
},
'SIM_IPHONE_X_14_2': {
'args': [
'--platform',
'iPhone X',
'--version',
'14.2',
],
'identifier': 'iPhone X 14.2'
},
'WEBLAYER_IMPL_SKEW_TESTS_NTH_MILESTONE': {
'args': [
'--test-runner-outdir',
......
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