[ios] Roll to Xcode 10.1.

CIPD packages: infra_internal/ios/xcode/mac 10b61 infra_internal/ios/xcode/ios 10b61 Bug: 903674 Change-Id: Ifd61e84840a4ff9d36a215ad0c8d11efc51cbfd0 Reviewed-on: https://chromium-review.googlesource.com/c/1329022Reviewed-by: John Budorick <jbudorick@chromium.org> Commit-Queue: Justin Cohen <justincohen@chromium.org> Cr-Commit-Position: refs/heads/master@{#606983}

[ios] Roll to Xcode 10.1.
CIPD packages: infra_internal/ios/xcode/mac 10b61 infra_internal/ios/xcode/ios 10b61 Bug: 903674 Change-Id: Ifd61e84840a4ff9d36a215ad0c8d11efc51cbfd0 Reviewed-on: https://chromium-review.googlesource.com/c/1329022Reviewed-by: John Budorick <jbudorick@chromium.org> Commit-Queue: Justin Cohen <justincohen@chromium.org> Cr-Commit-Position: refs/heads/master@{#606983}
16848611 · Justin Cohen · Commit Bot · 75ab80ce · 16848611 · 16848611
Commit 16848611 authored Nov 09, 2018 by Justin Cohen Committed by Commit Bot Nov 09, 2018
18 changed files
--- a/ios/build/bots/chromium.clang/ToTiOS.json
+++ b/ios/build/bots/chromium.clang/ToTiOS.json
@@ -2,7 +2,7 @@
  "comments": [
    "Clang tip-of-tree builder for iOS."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "ios_enable_code_signing=false",
    "is_component_build=false",
@@ -27,7 +27,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "boringssl_crypto_tests",
@@ -37,7 +37,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "boringssl_ssl_tests",
@@ -47,7 +47,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "components_unittests",
@@ -57,7 +57,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "crypto_unittests",
@@ -67,7 +67,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "gfx_unittests",
@@ -77,7 +77,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "google_apis_unittests",
@@ -87,7 +87,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "ios_chrome_unittests",
@@ -97,7 +97,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "ios_net_unittests",
@@ -107,7 +107,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "ios_web_inttests",
@@ -117,7 +117,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "ios_web_unittests",
@@ -127,7 +127,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "ios_web_view_inttests",
@@ -137,7 +137,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "net_unittests",
@@ -147,7 +147,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "skia_unittests",
@@ -157,7 +157,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "sql_unittests",
@@ -167,7 +167,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "ui_base_unittests",
@@ -177,7 +177,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    },
    {
      "app": "url_unittests",
@@ -187,7 +187,7 @@
        { "os": "Mac-10.13.5", "pool": "Chrome" },
        { "os": "Mac-10.13.6", "pool": "Chrome" }
      ],
-      "os": "12.0"
+      "os": "12.1"
    }
  ]
 }
--- a/ios/build/bots/chromium.clang/ToTiOSDevice.json
+++ b/ios/build/bots/chromium.clang/ToTiOSDevice.json
@@ -2,7 +2,7 @@
  "comments": [
    "Clang tip-of-tree builder for iOS device."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "is_debug=false",
    "llvm_force_head_revision=true",

--- a/ios/build/bots/chromium.fyi/ios-device-goma-canary-clobber.json
+++ b/ios/build/bots/chromium.fyi/ios-device-goma-canary-clobber.json
@@ -3,7 +3,7 @@
    "Goma canary builder for iOS.",
    "It is chromium.mac/ios-device.json + use_goma_canary, clobber."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "ios_enable_code_signing=false",

--- a/ios/build/bots/chromium.fyi/ios-simulator-cronet.json
+++ b/ios/build/bots/chromium.fyi/ios-simulator-cronet.json
@@ -3,7 +3,7 @@
    "Cronet tests for 32- and 64-bit iOS 9.0 simulators.",
    "Tests run on iPhone 5s (64-bit) and iPad Retina (32-bit)."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "additional_target_cpus=[\"x86\"]",
    "disable_brotli_filter=false",
@@ -86,7 +86,7 @@
    {
      "app": "cronet_test",
      "device type": "iPhone X",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },

--- a/ios/build/bots/chromium.fyi/ios-simulator.json
+++ b/ios/build/bots/chromium.fyi/ios-simulator.json
@@ -2,7 +2,7 @@
  "comments": [
    "Runs tests on FYI on the latest simulators."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "is_component_build=false",
@@ -20,7 +20,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -34,7 +34,7 @@
        "--enable-features=CredentialManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "xctest": true,
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
@@ -48,7 +48,7 @@
        "--enable-features=CredentialManager"
      ],
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "xctest": true,
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
@@ -62,7 +62,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "xctest": true,
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
@@ -76,7 +76,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "xctest": true,
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
@@ -90,7 +90,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "xctest": true,
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
@@ -104,7 +104,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "xctest": true,
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
@@ -118,7 +118,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "xctest": true,
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },

--- a/ios/build/bots/chromium.fyi/ios-slimnav.json
+++ b/ios/build/bots/chromium.fyi/ios-slimnav.json
@@ -2,7 +2,7 @@
  "comments": [
    "Test the SlimNavigationManager feature."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "is_component_build=false",
@@ -20,7 +20,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s Plus",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -34,7 +34,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -48,7 +48,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -62,7 +62,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -160,7 +160,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -188,7 +188,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone X",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -216,7 +216,7 @@
        "--enable-features=SlimNavigationManager"
      ],
      "device type": "iPhone X",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },

--- a/ios/build/bots/chromium.fyi/ios12-beta-simulator.json
+++ b/ios/build/bots/chromium.fyi/ios12-beta-simulator.json
@@ -3,7 +3,7 @@
    "Run tests on iOS12beta track on 64-bit iOS 12 simulators.",
    "Note: Xcode 10 requires OSX 10.13.4 hence 'host os'"
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "is_component_build=false",

--- a/ios/build/bots/chromium.mac/ios-device-xcode-clang.json
+++ b/ios/build/bots/chromium.mac/ios-device-xcode-clang.json
@@ -3,7 +3,7 @@
    "Builder for 32-bit devices.",
    "Build is performed with gn+ninja."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "ios_enable_code_signing=false",

--- a/ios/build/bots/chromium.mac/ios-device.json
+++ b/ios/build/bots/chromium.mac/ios-device.json
@@ -4,7 +4,7 @@
    "Build is performed with gn+ninja.",
    "If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "ios_enable_code_signing=false",

--- a/ios/build/bots/chromium.mac/ios-simulator-cronet.json
+++ b/ios/build/bots/chromium.mac/ios-simulator-cronet.json
@@ -2,7 +2,7 @@
  "comments": [
    "Cronet tests 64-bit iOS 9.3, 10.3, 11.4 and 12 simulators."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "additional_target_cpus=[\"x86\"]",
    "disable_brotli_filter=false",
@@ -46,7 +46,7 @@
    {
      "app": "cronet_unittests_ios",
      "device type": "iPhone 5s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -90,7 +90,7 @@
    {
      "app": "cronet_test",
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },

--- a/ios/build/bots/chromium.mac/ios-simulator-full-configs.json
+++ b/ios/build/bots/chromium.mac/ios-simulator-full-configs.json
@@ -3,7 +3,7 @@
    "Runs tests on 64-bit iOS 10, 11 and 12 tests on iPad, iPhone,",
    "@3x, and @2x on main waterfall ios-simulator-full-configs."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "is_component_build=false",
@@ -32,7 +32,7 @@
    {
      "include": "eg_tests.json",
      "device type": "iPhone 7",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -54,7 +54,7 @@
    {
      "include": "eg_tests.json",
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -76,7 +76,7 @@
    {
      "include": "eg_tests.json",
      "device type": "iPhone X",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -98,7 +98,7 @@
    {
      "include": "eg_cq_tests.json",
      "device type": "iPhone X",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },

--- a/ios/build/bots/chromium.mac/ios-simulator-xcode-clang.json
+++ b/ios/build/bots/chromium.mac/ios-simulator-xcode-clang.json
 {
  "comments": [
-    "Tests for 64-bit Xcode Clang for iOS 12.0 simulators.",
+    "Tests for 64-bit Xcode Clang for iOS 12.1 simulators.",
    "This 'xcode build version' must exist in GOMA",
    "Build is performed with gn+ninja."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "use xcode build version": true,
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",

--- a/ios/build/bots/chromium.mac/ios-simulator.json
+++ b/ios/build/bots/chromium.mac/ios-simulator.json
 {
  "comments": [
-    "Runs tests on 64-bit iOS 10.3 and 11.4 and 12.0 tests",
+    "Runs tests on 64-bit iOS 10.3 and 11.4 and 12.1 tests",
    "on iPad, iPhone, @3x, and @2x on main and CQ ios-simulator.",
    "Note: Xcode 10 requires Mac OS 10.13.4 or higher, hence 'host os'."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "is_component_build=false",
@@ -22,7 +22,7 @@
    {
      "include": "screen_size_dependent_tests.json",
      "device type": "iPhone 6s Plus",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -33,7 +33,7 @@
    {
      "include": "screen_size_dependent_tests.json",
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -44,7 +44,7 @@
    {
      "include": "common_tests.json",
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -55,7 +55,7 @@
    {
      "include": "screen_size_dependent_tests.json",
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },

--- a/ios/build/bots/chromium.mac/ios-uirefresh-simulator.json
+++ b/ios/build/bots/chromium.mac/ios-uirefresh-simulator.json
@@ -2,7 +2,7 @@
  "comments": [
    "UIRefresh tests for iPhone simulator."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "is_component_build=false",

--- a/ios/build/bots/chromium.mac/ios-webview.json
+++ b/ios/build/bots/chromium.mac/ios-webview.json
@@ -3,7 +3,7 @@
    "Hold back the ios_deployment_target to iOS10 for web_view and related",
    "tests, only testing on iOS 10.3 simulator."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "ios_deployment_target=\"10.0\"",

--- a/ios/build/bots/chromium.mac/ios12-sdk-simulator.json
+++ b/ios/build/bots/chromium.mac/ios12-sdk-simulator.json
 {
  "comments": [
-    "Runs tests on 64-bit iOS 10.3 and 11.4 and 12.0 tests",
+    "Runs tests on 64-bit iOS 10.3 and 11.4 and 12.1 tests",
    "on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.",
    "Note: Xcode 10.3 requires Mac OS 10.13.X or higher, hence 'host os'."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "goma_dir=\"$(goma_dir)\"",
    "is_component_build=false",
@@ -22,7 +22,7 @@
    {
      "include": "eg_cq_tests.json",
      "device type": "iPhone X",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -32,7 +32,7 @@
    {
      "include": "eg_tests.json",
      "device type": "iPhone X",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -42,7 +42,7 @@
    {
      "include": "eg_tests.json",
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -52,7 +52,7 @@
    {
      "include": "eg_tests.json",
      "device type": "iPhone 7",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -102,7 +102,7 @@
    {
      "include": "screen_size_dependent_tests.json",
      "device type": "iPhone 6s Plus",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -112,7 +112,7 @@
    {
      "include": "screen_size_dependent_tests.json",
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -122,7 +122,7 @@
    {
      "include": "screen_size_dependent_tests.json",
      "device type": "iPad Air 2",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },
@@ -152,7 +152,7 @@
    {
      "include": "eg_cq_tests.json",
      "device type": "iPhone 6s",
-      "os": "12.0",
+      "os": "12.1",
      "dimensions": [
        { "os": "Mac-10.13.4", "pool": "Chrome" },
        { "os": "Mac-10.13.5", "pool": "Chrome" },

--- a/ios/build/bots/chromium.webrtc.fyi/WebRTC Chromium FYI ios-device.json
+++ b/ios/build/bots/chromium.webrtc.fyi/WebRTC Chromium FYI ios-device.json
@@ -3,7 +3,7 @@
    "Builder for 32-bit devices.",
    "Build is performed with gn+ninja."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "additional_target_cpus=[ \"arm64\" ]",
    "goma_dir=\"$(goma_dir)\"",

--- a/ios/build/bots/chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator.json
+++ b/ios/build/bots/chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator.json
@@ -2,7 +2,7 @@
  "comments": [
    "Runs tests on @3x, @2x, 64-bit, 32-bit, phone, tablet, iOS 10, and iOS 9."
  ],
-  "xcode build version": "10a254a",
+  "xcode build version": "10b61",
  "gn_args": [
    "additional_target_cpus=[\"x86\"]",
    "goma_dir=\"$(goma_dir)\"",