From 33e58737123091bf25d5da6d0fe50120b2730f2b Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Thu, 2 Jun 2022 16:57:13 +0200
Subject: [PATCH] Upgrade iOS bots to xcode 13.

Also update ios 14.0 simulators to 14.5 because tests were failing.

Change-Id: I36c946ff26899502ad611d3f473f3692374b08a4
Bug: b/228171822
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264830
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#37103}
---
 infra/specs/client.webrtc.json    | 520 ++++++++----------------------
 infra/specs/mixins.pyl            |  19 +-
 infra/specs/mixins_webrtc.pyl     |  21 +-
 infra/specs/tryserver.webrtc.json | 520 ++++++++----------------------
 infra/specs/waterfalls.pyl        |  16 +-
 5 files changed, 296 insertions(+), 800 deletions(-)

diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index c00cd1cdc3..848fd164f9 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -8928,7 +8928,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -8959,11 +8959,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -8978,7 +8974,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9008,11 +9004,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9027,7 +9019,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9057,11 +9049,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9076,7 +9064,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9106,11 +9094,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9125,7 +9109,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9155,11 +9139,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9174,7 +9154,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9204,11 +9184,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9224,7 +9200,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9254,11 +9230,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9274,7 +9246,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9304,11 +9276,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9323,7 +9291,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9353,11 +9321,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9372,7 +9336,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9402,11 +9366,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9421,7 +9381,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9451,11 +9411,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9471,7 +9427,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -9502,11 +9458,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9521,7 +9473,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -9552,11 +9504,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9571,7 +9519,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9601,11 +9549,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9620,7 +9564,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9650,11 +9594,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9669,7 +9609,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9699,11 +9639,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9718,7 +9654,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9748,11 +9684,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9767,7 +9699,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9797,11 +9729,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9817,7 +9745,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9847,11 +9775,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9866,7 +9790,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9896,11 +9820,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9919,7 +9839,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -9950,11 +9870,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -9969,7 +9885,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -9999,11 +9915,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10018,7 +9930,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10048,11 +9960,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10067,7 +9975,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10097,11 +10005,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10116,7 +10020,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10146,11 +10050,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10165,7 +10065,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10195,11 +10095,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10215,7 +10111,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10245,11 +10141,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10265,7 +10157,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10295,11 +10187,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10314,7 +10202,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10344,11 +10232,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10363,7 +10247,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10393,11 +10277,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10412,7 +10292,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10442,11 +10322,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10462,7 +10338,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -10493,11 +10369,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10512,7 +10384,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -10543,11 +10415,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10562,7 +10430,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10592,11 +10460,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10611,7 +10475,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10641,11 +10505,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10660,7 +10520,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10690,11 +10550,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10709,7 +10565,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10739,11 +10595,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10758,7 +10610,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10788,11 +10640,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10808,7 +10656,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10838,11 +10686,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10857,7 +10701,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10887,11 +10731,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10908,9 +10748,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -10941,11 +10781,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -10958,9 +10794,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -10990,11 +10826,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11007,9 +10839,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11039,11 +10871,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11056,9 +10884,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11088,11 +10916,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11105,9 +10929,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11137,11 +10961,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11154,9 +10974,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11186,11 +11006,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11204,9 +11020,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11236,11 +11052,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11254,9 +11066,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11286,11 +11098,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11303,9 +11111,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11335,11 +11143,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11352,9 +11156,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11384,11 +11188,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11401,9 +11201,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11433,11 +11233,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11451,9 +11247,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -11484,11 +11280,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11501,9 +11293,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -11534,11 +11326,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11551,9 +11339,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11583,11 +11371,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11600,9 +11384,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11632,11 +11416,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11649,9 +11429,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11681,11 +11461,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11698,9 +11474,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11730,11 +11506,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11747,9 +11519,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11779,11 +11551,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11797,9 +11565,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11829,11 +11597,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -11846,9 +11610,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -11878,11 +11642,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 9459e9f813..a8d779633b 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -113,13 +113,13 @@
       }
     }
   },
-  'ios-simulator-14.0': {
+  'ios-simulator-14.5': {
     '$mixin_append': {
-      'args': ['--platform', 'iPhone X', '--version', '14.0'],
+      'args': ['--platform', 'iPhone X', '--version', '14.5'],
       'swarming': {
         'named_caches': [{
-          'name': 'runtime_ios_14_0',
-          'path': 'Runtime-ios-14.0'
+          'name': 'runtime_ios_14_5',
+          'path': 'Runtime-ios-14.5'
         }]
       }
     }
@@ -336,17 +336,6 @@
       }
     }
   },
-  'xcode_12a7209': {
-    '$mixin_append': {
-      'args': ['--xcode-build-version', '12a7209'],
-      'swarming': {
-        'named_caches': [{
-          'name': 'xcode_ios_12a7209',
-          'path': 'Xcode.app'
-        }]
-      }
-    }
-  },
   'xcode_12d4e': {
     '$mixin_append': {
       'args': ['--xcode-build-version', '12d4e'],
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 43d9c8b9a0..ae287261d8 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -89,19 +89,19 @@
       },
     }
   },
-  'ios-simulator-14.0': {
+  'ios-simulator-14.5': {
     '$mixin_append': {
       'args': [
         '--platform',
         'iPhone X',
         '--version',
-        '14.0',
+        '14.5',
       ],
       'swarming': {
         'named_caches': [
           {
-            'name': 'runtime_ios_14_0',
-            'path': 'Runtime-ios-14.0',
+            'name': 'runtime_ios_14_5',
+            'path': 'Runtime-ios-14.5',
           },
         ],
       },
@@ -260,17 +260,4 @@
       },
     },
   },
-  'xcode_12a7209': {
-    '$mixin_append': {
-      'args': ['--xcode-build-version', '12a7209'],
-      'swarming': {
-        'named_caches': [
-          {
-            'name': 'xcode_ios_12a7209',
-            'path': 'Xcode.app',
-          },
-        ],
-      },
-    },
-  },
 }
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 0064e78b3d..5f5057ac37 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -2715,7 +2715,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -2746,11 +2746,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -2765,7 +2761,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -2795,11 +2791,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -2814,7 +2806,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -2844,11 +2836,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -2863,7 +2851,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -2893,11 +2881,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -2912,7 +2896,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -2942,11 +2926,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -2961,7 +2941,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -2991,11 +2971,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3011,7 +2987,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3041,11 +3017,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3061,7 +3033,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3091,11 +3063,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3110,7 +3078,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3140,11 +3108,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3159,7 +3123,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3189,11 +3153,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3208,7 +3168,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3238,11 +3198,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3258,7 +3214,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -3289,11 +3245,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3308,7 +3260,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -3339,11 +3291,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3358,7 +3306,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3388,11 +3336,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3407,7 +3351,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3437,11 +3381,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3456,7 +3396,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3486,11 +3426,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3505,7 +3441,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3535,11 +3471,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3554,7 +3486,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3584,11 +3516,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3604,7 +3532,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3634,11 +3562,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3653,7 +3577,7 @@
           "--version",
           "12.4",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3683,11 +3607,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_12_4",
-              "path": "Runtime-ios-12.4"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3706,7 +3626,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -3737,11 +3657,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3756,7 +3672,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3786,11 +3702,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3805,7 +3717,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3835,11 +3747,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3854,7 +3762,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3884,11 +3792,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3903,7 +3807,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3933,11 +3837,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -3952,7 +3852,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -3982,11 +3882,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4002,7 +3898,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4032,11 +3928,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4052,7 +3944,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4082,11 +3974,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4101,7 +3989,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4131,11 +4019,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4150,7 +4034,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4180,11 +4064,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4199,7 +4079,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4229,11 +4109,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4249,7 +4125,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -4280,11 +4156,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4299,7 +4171,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -4330,11 +4202,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4349,7 +4217,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4379,11 +4247,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4398,7 +4262,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4428,11 +4292,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4447,7 +4307,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4477,11 +4337,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4496,7 +4352,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4526,11 +4382,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4545,7 +4397,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4575,11 +4427,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4595,7 +4443,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4625,11 +4473,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4644,7 +4488,7 @@
           "--version",
           "13.6",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4674,11 +4518,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_13_6",
-              "path": "Runtime-ios-13.6"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4695,9 +4535,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -4728,11 +4568,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4745,9 +4581,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4777,11 +4613,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4794,9 +4626,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4826,11 +4658,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4843,9 +4671,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4875,11 +4703,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4892,9 +4716,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4924,11 +4748,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4941,9 +4761,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -4973,11 +4793,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -4991,9 +4807,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5023,11 +4839,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5041,9 +4853,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5073,11 +4885,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5090,9 +4898,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5122,11 +4930,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5139,9 +4943,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5171,11 +4975,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5188,9 +4988,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5220,11 +5020,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5238,9 +5034,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -5271,11 +5067,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5288,9 +5080,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-parallelization"
@@ -5321,11 +5113,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5338,9 +5126,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5370,11 +5158,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5387,9 +5171,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5419,11 +5203,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5436,9 +5216,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5468,11 +5248,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5485,9 +5261,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5517,11 +5293,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5534,9 +5306,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5566,11 +5338,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5584,9 +5352,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5616,11 +5384,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
@@ -5633,9 +5397,9 @@
           "--platform",
           "iPhone X",
           "--version",
-          "14.0",
+          "14.5",
           "--xcode-build-version",
-          "12a7209",
+          "13c100",
           "--out-dir",
           "${ISOLATED_OUTDIR}"
         ],
@@ -5665,11 +5429,7 @@
           ],
           "named_caches": [
             {
-              "name": "runtime_ios_14_0",
-              "path": "Runtime-ios-14.0"
-            },
-            {
-              "name": "xcode_ios_12a7209",
+              "name": "xcode_ios_13c100",
               "path": "Xcode.app"
             }
           ],
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 0b146bd3c3..12afb57e42 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -203,7 +203,7 @@
       'iOS64 Sim Debug (iOS 12)': {
         'mixins': [
           'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
-          'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+          'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],
         'test_suites': {
@@ -213,7 +213,7 @@
       'iOS64 Sim Debug (iOS 13)': {
         'mixins': [
           'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
-          'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+          'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],
         'test_suites': {
@@ -222,8 +222,8 @@
       },
       'iOS64 Sim Debug (iOS 14.0)': {
         'mixins': [
-          'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0',
-          'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+          'mac11', 'chromium-tester-service-account', 'ios-simulator-14.5',
+          'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],
         'test_suites': {
@@ -421,7 +421,7 @@
       'ios_sim_x64_dbg_ios12': {
         'mixins': [
           'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
-          'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+          'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],
         'test_suites': {
@@ -431,7 +431,7 @@
       'ios_sim_x64_dbg_ios13': {
         'mixins': [
           'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
-          'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+          'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],
         'test_suites': {
@@ -440,8 +440,8 @@
       },
       'ios_sim_x64_dbg_ios14': {
         'mixins': [
-          'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0',
-          'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
+          'mac11', 'chromium-tester-service-account', 'ios-simulator-14.5',
+          'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
           'out_dir_arg'
         ],
         'test_suites': {