iOS simulator upgrade iOS version to run the tests. iOS 15.5 is not tested anymore and we start to test on iOS 18.0. Change-Id: Ia7340d25f6cf8480763ea689db267c0c9a843319 Bug: b/353975341 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/357640 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#42659}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json index a361089..2a018ca 100644 --- a/infra/specs/client.webrtc.json +++ b/infra/specs/client.webrtc.json
@@ -8006,9 +8006,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcodebuild-sim-runner", "--xcode-build-version", "15f31d", @@ -8019,7 +8019,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "apprtcmobile_tests iPhone X 15.5", + "name": "apprtcmobile_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8042,15 +8042,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "apprtcmobile_tests", "test_id_prefix": "ninja://examples:apprtcmobile_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -8152,9 +8152,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -8164,7 +8164,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "audio_decoder_unittests iPhone X 15.5", + "name": "audio_decoder_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8187,15 +8187,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "audio_decoder_unittests", "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -8296,9 +8296,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -8308,7 +8308,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_audio_unittests iPhone X 15.5", + "name": "common_audio_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8331,15 +8331,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "common_audio_unittests", "test_id_prefix": "ninja://common_audio:common_audio_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -8440,9 +8440,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -8452,7 +8452,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone X 15.5", + "name": "common_video_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8475,15 +8475,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "common_video_unittests", "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -8584,9 +8584,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -8596,7 +8596,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone X 15.5", + "name": "dcsctp_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8619,15 +8619,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -8729,9 +8729,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -8741,7 +8741,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone X 15.5", + "name": "modules_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8764,8 +8764,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -8773,7 +8773,7 @@ }, "test": "modules_tests", "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -8877,9 +8877,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -8889,7 +8889,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone X 15.5", + "name": "modules_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -8913,8 +8913,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -8922,7 +8922,7 @@ }, "test": "modules_unittests", "test_id_prefix": "ninja://modules:modules_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -9025,9 +9025,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -9037,7 +9037,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_media_unittests iPhone X 15.5", + "name": "rtc_media_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9060,15 +9060,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -9169,9 +9169,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -9181,7 +9181,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_pc_unittests iPhone X 15.5", + "name": "rtc_pc_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9204,15 +9204,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -9313,9 +9313,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -9325,7 +9325,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_stats_unittests iPhone X 15.5", + "name": "rtc_stats_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9348,15 +9348,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -9458,9 +9458,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -9470,7 +9470,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_unittests iPhone X 15.5", + "name": "rtc_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9493,8 +9493,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -9502,7 +9502,7 @@ }, "test": "rtc_unittests", "test_id_prefix": "ninja://:rtc_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -9605,9 +9605,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcodebuild-sim-runner", "--xcode-build-version", "15f31d", @@ -9618,7 +9618,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "sdk_framework_unittests iPhone X 15.5", + "name": "sdk_framework_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9641,15 +9641,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "sdk_framework_unittests", "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -9752,9 +9752,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcodebuild-sim-runner", "--xcode-build-version", "15f31d", @@ -9765,7 +9765,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "sdk_unittests iPhone X 15.5", + "name": "sdk_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9788,15 +9788,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "sdk_unittests", "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -9900,9 +9900,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -9912,7 +9912,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "svc_tests iPhone X 15.5", + "name": "svc_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -9936,8 +9936,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -9945,7 +9945,7 @@ }, "test": "svc_tests", "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -10048,9 +10048,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -10060,7 +10060,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone X 15.5", + "name": "system_wrappers_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10083,15 +10083,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "system_wrappers_unittests", "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -10192,9 +10192,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -10204,7 +10204,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone X 15.5", + "name": "test_support_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10227,15 +10227,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -10336,9 +10336,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -10348,7 +10348,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone X 15.5", + "name": "tools_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10371,15 +10371,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -10481,9 +10481,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -10493,7 +10493,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone X 15.5", + "name": "video_engine_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10516,8 +10516,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -10525,7 +10525,7 @@ }, "test": "video_engine_tests", "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -10627,9 +10627,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -10639,7 +10639,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone X 15.5", + "name": "voip_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10662,15 +10662,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -10771,9 +10771,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -10783,7 +10783,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone X 15.5", + "name": "webrtc_nonparallel_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -10806,15 +10806,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 4af6a50..8fa9277 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl
@@ -82,14 +82,6 @@ } } }, - 'ios_runtime_cache_15_5': { - 'swarming': { - 'named_caches': [{ - 'name': 'runtime_ios_15_5', - 'path': 'Runtime-ios-15.5' - }] - } - }, 'ios_runtime_cache_16_4': { 'swarming': { 'named_caches': [{ @@ -106,6 +98,14 @@ }] } }, + 'ios_runtime_cache_18_0': { + 'swarming': { + 'named_caches': [{ + 'name': 'runtime_ios_18_0', + 'path': 'Runtime-ios-18.0' + }] + } + }, 'isolate_profile_data': { 'isolate_profile_data': True },
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl index 0575b07..52fcdf1 100644 --- a/infra/specs/mixins_webrtc.pyl +++ b/infra/specs/mixins_webrtc.pyl
@@ -57,14 +57,6 @@ }, }, }, - 'ios_runtime_cache_15_5': { - 'swarming': { - 'named_caches': [{ - 'name': 'runtime_ios_15_5', - 'path': 'Runtime-ios-15.5' - }] - } - }, '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.
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl index ee2dbc8..478e521 100644 --- a/infra/specs/test_suites.pyl +++ b/infra/specs/test_suites.pyl
@@ -264,9 +264,9 @@ 'ios_simulator_tests_matrix': { 'ios_simulator_tests': { 'variants': [ - 'SIM_IPHONE_X_15_5', 'SIM_IPHONE_X_16_4', 'SIM_IPHONE_14_17_4', + 'SIM_IPHONE_15_18_0', ], }, },
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json index e50634d..7f4ba64 100644 --- a/infra/specs/tryserver.webrtc.json +++ b/infra/specs/tryserver.webrtc.json
@@ -2368,9 +2368,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcodebuild-sim-runner", "--xcode-build-version", "15f31d", @@ -2381,7 +2381,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "apprtcmobile_tests iPhone X 15.5", + "name": "apprtcmobile_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -2404,15 +2404,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "apprtcmobile_tests", "test_id_prefix": "ninja://examples:apprtcmobile_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -2514,9 +2514,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -2526,7 +2526,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "audio_decoder_unittests iPhone X 15.5", + "name": "audio_decoder_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -2549,15 +2549,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "audio_decoder_unittests", "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -2658,9 +2658,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -2670,7 +2670,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_audio_unittests iPhone X 15.5", + "name": "common_audio_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -2693,15 +2693,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "common_audio_unittests", "test_id_prefix": "ninja://common_audio:common_audio_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -2802,9 +2802,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -2814,7 +2814,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "common_video_unittests iPhone X 15.5", + "name": "common_video_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -2837,15 +2837,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "common_video_unittests", "test_id_prefix": "ninja://common_video:common_video_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -2946,9 +2946,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -2958,7 +2958,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "dcsctp_unittests iPhone X 15.5", + "name": "dcsctp_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -2981,15 +2981,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "dcsctp_unittests", "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -3091,9 +3091,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -3103,7 +3103,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_tests iPhone X 15.5", + "name": "modules_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3126,8 +3126,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -3135,7 +3135,7 @@ }, "test": "modules_tests", "test_id_prefix": "ninja://modules:modules_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -3239,9 +3239,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -3251,7 +3251,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "modules_unittests iPhone X 15.5", + "name": "modules_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3275,8 +3275,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -3284,7 +3284,7 @@ }, "test": "modules_unittests", "test_id_prefix": "ninja://modules:modules_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -3387,9 +3387,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -3399,7 +3399,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_media_unittests iPhone X 15.5", + "name": "rtc_media_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3422,15 +3422,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_media_unittests", "test_id_prefix": "ninja://media:rtc_media_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -3531,9 +3531,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -3543,7 +3543,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_pc_unittests iPhone X 15.5", + "name": "rtc_pc_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3566,15 +3566,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_pc_unittests", "test_id_prefix": "ninja://pc:rtc_pc_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -3675,9 +3675,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -3687,7 +3687,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_stats_unittests iPhone X 15.5", + "name": "rtc_stats_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3710,15 +3710,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "rtc_stats_unittests", "test_id_prefix": "ninja://stats:rtc_stats_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -3820,9 +3820,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -3832,7 +3832,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "rtc_unittests iPhone X 15.5", + "name": "rtc_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -3855,8 +3855,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -3864,7 +3864,7 @@ }, "test": "rtc_unittests", "test_id_prefix": "ninja://:rtc_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -3967,9 +3967,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcodebuild-sim-runner", "--xcode-build-version", "15f31d", @@ -3980,7 +3980,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "sdk_framework_unittests iPhone X 15.5", + "name": "sdk_framework_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4003,15 +4003,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "sdk_framework_unittests", "test_id_prefix": "ninja://sdk:sdk_framework_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -4114,9 +4114,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcodebuild-sim-runner", "--xcode-build-version", "15f31d", @@ -4127,7 +4127,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "sdk_unittests iPhone X 15.5", + "name": "sdk_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4150,15 +4150,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "sdk_unittests", "test_id_prefix": "ninja://sdk:sdk_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -4262,9 +4262,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -4274,7 +4274,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "svc_tests iPhone X 15.5", + "name": "svc_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4298,8 +4298,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4307,7 +4307,7 @@ }, "test": "svc_tests", "test_id_prefix": "ninja://pc:svc_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -4410,9 +4410,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -4422,7 +4422,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "system_wrappers_unittests iPhone X 15.5", + "name": "system_wrappers_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4445,15 +4445,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "system_wrappers_unittests", "test_id_prefix": "ninja://system_wrappers:system_wrappers_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -4554,9 +4554,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -4566,7 +4566,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "test_support_unittests iPhone X 15.5", + "name": "test_support_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4589,15 +4589,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "test_support_unittests", "test_id_prefix": "ninja://test:test_support_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -4698,9 +4698,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -4710,7 +4710,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "tools_unittests iPhone X 15.5", + "name": "tools_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4733,15 +4733,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "tools_unittests", "test_id_prefix": "ninja://rtc_tools:tools_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -4843,9 +4843,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -4855,7 +4855,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "video_engine_tests iPhone X 15.5", + "name": "video_engine_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -4878,8 +4878,8 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4887,7 +4887,7 @@ }, "test": "video_engine_tests", "test_id_prefix": "ninja://:video_engine_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -4989,9 +4989,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -5001,7 +5001,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "voip_unittests iPhone X 15.5", + "name": "voip_unittests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5024,15 +5024,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "voip_unittests", "test_id_prefix": "ninja://:voip_unittests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [ @@ -5133,9 +5133,9 @@ { "args": [ "--platform", - "iPhone X", + "iPhone 15", "--version", - "15.5", + "18.0", "--xcode-build-version", "15f31d", "--out-dir", @@ -5145,7 +5145,7 @@ "merge": { "script": "//testing/merge_scripts/standard_isolated_script_merge.py" }, - "name": "webrtc_nonparallel_tests iPhone X 15.5", + "name": "webrtc_nonparallel_tests iPhone 15 18.0", "resultdb": { "enable": true, "has_native_resultdb_integration": true @@ -5168,15 +5168,15 @@ "path": "Xcode.app" }, { - "name": "runtime_ios_15_5", - "path": "Runtime-ios-15.5" + "name": "runtime_ios_18_0", + "path": "Runtime-ios-18.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, "test": "webrtc_nonparallel_tests", "test_id_prefix": "ninja://:webrtc_nonparallel_tests/", - "variant_id": "iPhone X 15.5" + "variant_id": "iPhone 15 18.0" }, { "args": [
diff --git a/infra/specs/variants.pyl b/infra/specs/variants.pyl index e5cba7e..444fbbb 100644 --- a/infra/specs/variants.pyl +++ b/infra/specs/variants.pyl
@@ -7,16 +7,6 @@ # be found in the AUTHORS file in the root of the source tree. { - 'SIM_IPHONE_X_15_5': { - 'args': [ - '--platform', - 'iPhone X', - '--version', - '15.5', - ], - 'identifier': 'iPhone X 15.5', - 'mixins': ['xcode_15_main', 'ios_runtime_cache_15_5'], - }, 'SIM_IPHONE_X_16_4': { 'args': [ '--platform', @@ -37,4 +27,14 @@ 'identifier': 'iPhone 14 17.5', 'mixins': ['xcode_15_main', 'ios_runtime_cache_17_5'], }, + 'SIM_IPHONE_15_18_0': { + 'args': [ + '--platform', + 'iPhone 15', + '--version', + '18.0', + ], + 'identifier': 'iPhone 15 18.0', + 'mixins': ['xcode_15_main', 'ios_runtime_cache_18_0'], + }, }