Upgrade iOS simulator configuration.

Change-Id: I458417c94659188f26feac6237d066acce5ac3dd
Bug: b/319049739
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/333780
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Reviewed-by: Christoffer Dewerin <jansson@google.com>
Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41473}
This commit is contained in:
Jeremy Leconte 2024-01-08 10:31:16 +01:00 committed by WebRTC LUCI CQ
parent c41977d303
commit 293af4b5e0
7 changed files with 838 additions and 990 deletions

File diff suppressed because it is too large Load Diff

View File

@ -78,14 +78,6 @@
}
}
},
'ios_runtime_cache_14_5': {
'swarming': {
'named_caches': [{
'name': 'runtime_ios_14_5',
'path': 'Runtime-ios-14.5'
}]
}
},
'ios_runtime_cache_15_5': {
'swarming': {
'named_caches': [{
@ -94,11 +86,19 @@
}]
}
},
'ios_runtime_cache_16_2': {
'ios_runtime_cache_16_4': {
'swarming': {
'named_caches': [{
'name': 'runtime_ios_16_2',
'path': 'Runtime-ios-16.2'
'name': 'runtime_ios_16_4',
'path': 'Runtime-ios-16.4'
}]
}
},
'ios_runtime_cache_17_0': {
'swarming': {
'named_caches': [{
'name': 'runtime_ios_17_0',
'path': 'Runtime-ios-17.0'
}]
}
},
@ -154,6 +154,14 @@
}
}
},
'mac_13_x64': {
'swarming': {
'dimensions': {
'cpu': 'x86-64',
'os': 'Mac-13'
}
}
},
'mac_toolchain': {
'swarming': {
'cipd_packages': [{
@ -299,18 +307,6 @@
}
}
},
'xcode_13_main': {
'args': ['--xcode-build-version', '13c100'],
'swarming': {
'dimensions': {
'caches': 'xcode_ios_13c100'
},
'named_caches': [{
'name': 'xcode_ios_13c100',
'path': 'Xcode.app'
}]
}
},
'xcode_14_main': {
'args': ['--xcode-build-version', '14c18'],
'swarming': {

View File

@ -58,22 +58,6 @@
},
},
},
'ios_runtime_cache_14_5': {
'swarming': {
'named_caches': [{
'name': 'runtime_ios_14_5',
'path': 'Runtime-ios-14.5'
}]
}
},
'ios_runtime_cache_16_2': {
'swarming': {
'named_caches': [{
'name': 'runtime_ios_16_2',
'path': 'Runtime-ios-16.2'
}]
}
},
'limited-capacity': {
# Sometimes there are multiple tests that can be run only on one machine.
# We need to increase timeouts so the tests dont expire before the machine is freed.
@ -207,18 +191,6 @@
'--xctest',
],
},
'xcode_13_main': {
'args': ['--xcode-build-version', '13c100'],
'swarming': {
'dimensions': {
'caches': 'xcode_ios_13c100',
},
'named_caches': [{
'name': 'xcode_ios_13c100',
'path': 'Xcode.app'
}]
}
},
'xcode_14_main': {
'args': ['--xcode-build-version', '14c18'],
'swarming': {

View File

@ -258,9 +258,9 @@
'ios_simulator_tests_matrix': {
'ios_simulator_tests': {
'variants': [
'SIM_IPHONE_X_14_5',
'SIM_IPHONE_X_15_5',
'SIM_IPHONE_X_16_2',
'SIM_IPHONE_X_16_4',
'SIM_IPHONE_14_17_0',
],
},
},

File diff suppressed because it is too large Load Diff

View File

@ -7,16 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'SIM_IPHONE_X_14_5': {
'args': [
'--platform',
'iPhone X',
'--version',
'14.5',
],
'identifier': 'iPhone X 14.5',
'mixins': ['xcode_13_main', 'ios_runtime_cache_14_5'],
},
'SIM_IPHONE_X_15_5': {
'args': [
'--platform',
@ -25,16 +15,26 @@
'15.5',
],
'identifier': 'iPhone X 15.5',
'mixins': ['xcode_14_main', 'ios_runtime_cache_15_5'],
'mixins': ['xcode_15_main', 'ios_runtime_cache_15_5'],
},
'SIM_IPHONE_X_16_2': {
'SIM_IPHONE_X_16_4': {
'args': [
'--platform',
'iPhone X',
'--version',
'16.2',
'16.4',
],
'identifier': 'iPhone X 16.2',
'mixins': ['xcode_14_main', 'ios_runtime_cache_16_2'],
'identifier': 'iPhone X 16.4',
'mixins': ['xcode_15_main', 'ios_runtime_cache_16_4'],
},
'SIM_IPHONE_14_17_0': {
'args': [
'--platform',
'iPhone 14',
'--version',
'17.0',
],
'identifier': 'iPhone 14 17.0',
'mixins': ['xcode_15_main', 'ios_runtime_cache_17_0'],
},
}

View File

@ -228,7 +228,7 @@
},
'iOS Debug (simulator)': {
'mixins': [
'mac_12_x64', 'chromium-tester-service-account', 'mac_toolchain',
'mac_13_x64', 'chromium-tester-service-account', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg', 'webrtc-xctest'
],
'test_suites': {
@ -431,7 +431,7 @@
'ios_compile_arm64_rel': {},
'ios_dbg_simulator': {
'mixins': [
'mac_12_x64', 'chromium-tester-service-account', 'mac_toolchain',
'mac_13_x64', 'chromium-tester-service-account', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg', 'webrtc-xctest'
],
'test_suites': {