Update ios simulator variants.
iPhone x/10 simulator does not work well with newer xcode versions.
Change-Id: Ib1e411bd54d546fa3ca827d2f3dee718e4ff1837
Bug: chromium:441889296
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/407480
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45527}
diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 0578d61..1090d0c 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -8554,55 +8554,6 @@
},
{
"args": [
- "--xcodebuild-sim-runner",
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "apprtcmobile_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "apprtcmobile_tests",
- "test_id_prefix": "ninja://examples:apprtcmobile_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
"--platform",
"iPhone 14",
"--version",
@@ -8700,54 +8651,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "audio_decoder_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -8844,54 +8747,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "common_audio_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -8988,54 +8843,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "common_video_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -9132,54 +8939,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "dcsctp_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -9278,55 +9037,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "modules_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 2
- },
- "test": "modules_tests",
- "test_id_prefix": "ninja://modules:modules_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -9427,56 +9137,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "modules_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 6
- },
- "test": "modules_unittests",
- "test_id_prefix": "ninja://modules:modules_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -9573,54 +9233,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_media_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -9717,54 +9329,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_p2p_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "rtc_p2p_unittests",
- "test_id_prefix": "ninja://:rtc_p2p_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -9861,54 +9425,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_pc_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -10004,54 +9520,6 @@
},
{
"args": [
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_stats_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
"--xcodebuild-sim-runner",
"--platform",
"iPhone 14",
@@ -10152,55 +9620,6 @@
"args": [
"--xcodebuild-sim-runner",
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "sdk_framework_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--xcodebuild-sim-runner",
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -10297,55 +9716,6 @@
},
{
"args": [
- "--xcodebuild-sim-runner",
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "sdk_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "sdk_unittests",
- "test_id_prefix": "ninja://sdk:sdk_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
"--platform",
"iPhone 14",
"--version",
@@ -10447,56 +9817,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "svc_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 4
- },
- "test": "svc_tests",
- "test_id_prefix": "ninja://pc:svc_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -10593,54 +9913,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "system_wrappers_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -10737,54 +10009,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "test_support_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -10881,54 +10105,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "tools_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -11027,55 +10203,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_engine_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 4
- },
- "test": "video_engine_tests",
- "test_id_prefix": "ninja://:video_engine_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -11172,54 +10299,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "voip_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "voip_unittests",
- "test_id_prefix": "ninja://:voip_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -11312,54 +10391,6 @@
"test": "webrtc_nonparallel_tests",
"test_id_prefix": "ninja://:webrtc_nonparallel_tests/",
"variant_id": "iPhone 15 18.2"
- },
- {
- "args": [
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "webrtc_nonparallel_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
}
]
},
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 4f0fb27..2398ac8 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -83,14 +83,6 @@
}
}
},
- 'ios_runtime_cache_16_4': {
- 'swarming': {
- 'named_caches': [{
- 'name': 'runtime_ios_16_4',
- 'path': 'Runtime-ios-16.4'
- }]
- }
- },
'ios_runtime_cache_17_5': {
'swarming': {
'named_caches': [{
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 7d38c54..834ccc6 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -63,16 +63,6 @@
},
},
},
- 'ios_runtime_cache_16_4': {
- 'swarming': {
- 'named_caches': [
- {
- 'name': 'runtime_ios_16_4',
- 'path': 'Runtime-ios-16.4',
- },
- ],
- },
- },
'ios_runtime_cache_17_5': {
'swarming': {
'named_caches': [
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index 3f1d1be..0dc2ab9 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -272,7 +272,6 @@
'ios_simulator_tests_matrix': {
'ios_simulator_tests': {
'variants': [
- 'SIM_IPHONE_X_16_4',
'SIM_IPHONE_14_17_5',
'SIM_IPHONE_15_18_2',
],
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 30d77a6..32dae34 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -2608,55 +2608,6 @@
},
{
"args": [
- "--xcodebuild-sim-runner",
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "apprtcmobile_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "apprtcmobile_tests",
- "test_id_prefix": "ninja://examples:apprtcmobile_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
"--platform",
"iPhone 14",
"--version",
@@ -2754,54 +2705,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "audio_decoder_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -2898,54 +2801,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "common_audio_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -3042,54 +2897,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "common_video_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -3186,54 +2993,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "dcsctp_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -3332,55 +3091,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "modules_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 2
- },
- "test": "modules_tests",
- "test_id_prefix": "ninja://modules:modules_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -3481,56 +3191,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "modules_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 6
- },
- "test": "modules_unittests",
- "test_id_prefix": "ninja://modules:modules_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -3627,54 +3287,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_media_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -3771,54 +3383,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_p2p_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "rtc_p2p_unittests",
- "test_id_prefix": "ninja://:rtc_p2p_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -3915,54 +3479,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_pc_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -4058,54 +3574,6 @@
},
{
"args": [
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "rtc_stats_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
"--xcodebuild-sim-runner",
"--platform",
"iPhone 14",
@@ -4206,55 +3674,6 @@
"args": [
"--xcodebuild-sim-runner",
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "sdk_framework_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--xcodebuild-sim-runner",
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -4351,55 +3770,6 @@
},
{
"args": [
- "--xcodebuild-sim-runner",
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "sdk_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "sdk_unittests",
- "test_id_prefix": "ninja://sdk:sdk_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
"--platform",
"iPhone 14",
"--version",
@@ -4501,56 +3871,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "svc_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cores": "12",
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 4
- },
- "test": "svc_tests",
- "test_id_prefix": "ninja://pc:svc_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -4647,54 +3967,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "system_wrappers_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -4791,54 +4063,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "test_support_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -4935,54 +4159,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "tools_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -5081,55 +4257,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "video_engine_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 4
- },
- "test": "video_engine_tests",
- "test_id_prefix": "ninja://:video_engine_tests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -5226,54 +4353,6 @@
{
"args": [
"--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "voip_unittests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "voip_unittests",
- "test_id_prefix": "ninja://:voip_unittests/",
- "variant_id": "iPhone X 16.4"
- },
- {
- "args": [
- "--platform",
"iPhone 14",
"--version",
"17.5",
@@ -5366,54 +4445,6 @@
"test": "webrtc_nonparallel_tests",
"test_id_prefix": "ninja://:webrtc_nonparallel_tests/",
"variant_id": "iPhone 15 18.2"
- },
- {
- "args": [
- "--platform",
- "iPhone X",
- "--version",
- "16.4",
- "--xcode-build-version",
- "17a5305f",
- "--out-dir",
- "${ISOLATED_OUTDIR}",
- "--xctest"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "webrtc_nonparallel_tests iPhone X 16.4",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "cipd_packages": [
- {
- "cipd_package": "infra/tools/mac_toolchain/${platform}",
- "location": ".",
- "revision": "git_revision:4c7290150d1c360cecc6a93c0214dc531585c3ab"
- }
- ],
- "dimensions": {
- "cpu": "x86-64",
- "os": "Mac-15"
- },
- "named_caches": [
- {
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
- "name": "runtime_ios_16_4",
- "path": "Runtime-ios-16.4"
- }
- ],
- "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 16.4"
}
]
},
diff --git a/infra/specs/variants.pyl b/infra/specs/variants.pyl
index ae97ddb..d1e72fb 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_16_4': {
- 'args': [
- '--platform',
- 'iPhone X',
- '--version',
- '16.4',
- ],
- 'identifier': 'iPhone X 16.4',
- 'mixins': ['xcode_17_main', 'ios_runtime_cache_16_4'],
- },
'SIM_IPHONE_14_17_5': {
'args': [
'--platform',
