[ios] Roll iOS bots to Xcode 11 beta 5.

Bug: 992500
Change-Id: I797068fb5d58f5ebb19231d2c77ef1d5cb60b3f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724702Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686623}

infra/config/cr-buildbucket.cfg

@@ -774,9 +774,9 @@ builder_mixins {
 builder_mixins {
   name: "xcode-caches"
   caches: {
-    # Cache for Xcode 10.1 (build version 10b61) needed for iOS builds.
-    name: "xcode_ios_10b61"
-    path: "xcode_ios_10b61.app"
+    # Cache for Xcode 10.1 (build version 11m382q) needed for iOS builds.
+    name: "xcode_ios_11m382q"
+    path: "xcode_ios_11m382q.app"
   }
 }
 

ios/build/bots/chromium.clang/ToTiOS.json

@@ -2,7 +2,7 @@
   "comments": [
     "Clang tip-of-tree builder for iOS."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "ios_enable_code_signing=false",
     "is_component_build=false",
@@ -22,119 +22,119 @@
     {
       "app": "base_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "boringssl_crypto_tests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "boringssl_ssl_tests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "components_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "crypto_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "gfx_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "google_apis_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "ios_chrome_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "ios_net_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "ios_web_inttests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "ios_web_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "ios_web_view_inttests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "net_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "skia_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "sql_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "ui_base_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     },
     {
       "app": "url_unittests",
       "device type": "iPhone 6s",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "os": "12.1"
     }

ios/build/bots/chromium.clang/ToTiOSDevice.json

@@ -2,7 +2,7 @@
   "comments": [
     "Clang tip-of-tree builder for iOS device."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "is_debug=false",
     "llvm_force_head_revision=true",
@@ -37,103 +37,86 @@
     {
       "app": "base_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "boringssl_crypto_tests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "boringssl_ssl_tests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "components_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "crypto_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "gfx_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "google_apis_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "ios_chrome_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "ios_net_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "ios_web_inttests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "ios_web_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "ios_web_view_inttests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "net_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "skia_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "sql_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "ui_base_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     },
     {
       "app": "url_unittests",
       "device type": "iPhone 6s",
-      "xcode build version": "11m382q",
       "os": "12.3.1"
     }
   ],

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": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",

ios/build/bots/chromium.fyi/ios-device-goma-latest-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": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",

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": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",
     "disable_brotli_filter=false",
@@ -27,106 +27,50 @@
       "app": "cronet_unittests_ios",
       "device type": "iPhone 5s",
       "os": "9.3",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "cronet_test",
       "device type": "iPhone 5s",
       "os": "9.3",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "cronet_test",
       "device type": "iPad Retina",
       "os": "9.3",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "cronet_test",
       "device type": "iPhone 5s",
       "os": "11.4",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "cronet_test",
       "device type": "iPad Air 2",
       "os": "11.4",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "cronet_test",
       "device type": "iPhone X",
       "os": "11.4",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "cronet_test",
       "device type": "iPhone X",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     }
   ]
 }

ios/build/bots/chromium.fyi/ios-simulator.json

@@ -2,7 +2,7 @@
   "comments": [
     "Runs tests on FYI on the latest simulators."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "is_component_build=false",
@@ -21,16 +21,8 @@
       ],
       "device type": "iPhone 6s",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "ios_chrome_integration_egtests",
@@ -40,16 +32,8 @@
       "device type": "iPhone 6s",
       "os": "12.1",
       "xctest": true,
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "ios_chrome_integration_egtests",
@@ -59,16 +43,8 @@
       "device type": "iPad Air 2",
       "os": "12.1",
       "xctest": true,
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "ios_chrome_integration_egtests",
@@ -78,16 +54,8 @@
       "device type": "iPhone 6s",
       "os": "12.1",
       "xctest": true,
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "ios_chrome_smoke_egtests",
@@ -97,16 +65,8 @@
       "device type": "iPhone 6s",
       "os": "12.1",
       "xctest": true,
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "ios_chrome_web_egtests",
@@ -116,16 +76,8 @@
       "device type": "iPhone 6s",
       "os": "12.1",
       "xctest": true,
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-              "host os": "Mac-10.14.4"
-          }],
-          "60": [{
-              "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "ios_web_shell_egtests",
@@ -135,16 +87,8 @@
       "device type": "iPhone 6s",
       "os": "12.1",
       "xctest": true,
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     },
     {
       "app": "ios_chrome_ui_egtests",
@@ -154,16 +98,8 @@
       "device type": "iPhone 6s",
       "os": "12.1",
       "xctest": true,
-      "host os": "Mac-10.13.6",
-      "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      }
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome"
     }
   ]
 }

ios/build/bots/chromium.fyi/ios13-sdk-device.json

@@ -3,7 +3,7 @@
     "Builder for Xcode 11 iOS 13 SDK",
     "Build is performed with gn+ninja."
   ],
-  "xcode build version": "10e125",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",

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": "10b61",
+  "xcode build version": "11M382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",
@@ -12,7 +12,7 @@
     "symbol_level=0",
     "target_cpu=\"arm64\"",
     "target_os=\"ios\"",
-    "use_goma=true",
+    "use_goma=false",
     "use_xcode_clang=true"
   ],
   "additional_compile_targets": [

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": "10b61",
+  "xcode build version": "11M382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",

ios/build/bots/chromium.mac/ios-simulator-cronet.json

 {
   "comments": [
-    "Cronet tests 64-bit iOS 9.3, 10.3, 11.4 and 12 simulators."
+    "Cronet tests 64-bit iOS 9.3, 10.3, 11.4 and 12 and 13 simulators."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11M382q",
   "gn_args": [
     "additional_target_cpus=[\"x86\"]",
     "disable_brotli_filter=false",
@@ -25,7 +25,7 @@
       "app": "cronet_unittests_ios",
       "device type": "iPhone 5s",
       "os": "9.3",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "priority": 30
     },
@@ -33,7 +33,7 @@
       "app": "cronet_unittests_ios",
       "device type": "iPhone 5s",
       "os": "11.4",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "priority": 30
     },
@@ -41,7 +41,7 @@
       "app": "cronet_unittests_ios",
       "device type": "iPhone 5s",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "priority": 30
     },
@@ -49,7 +49,7 @@
       "app": "cronet_test",
       "device type": "iPhone 5s",
       "os": "9.3",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "priority": 30
     },
@@ -57,7 +57,7 @@
       "app": "cronet_test",
       "device type": "iPad Air 2",
       "os": "11.4",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "priority": 30
     },
@@ -65,7 +65,7 @@
       "app": "cronet_test",
       "device type": "iPad Air 2",
       "os": "10.3",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "priority": 30
     },
@@ -73,7 +73,15 @@
       "app": "cronet_test",
       "device type": "iPad Air 2",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
+      "pool": "Chrome",
+      "priority": 30
+    },
+    {
+      "app": "cronet_test",
+      "device type": "iPad Air 2",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
       "pool": "Chrome",
       "priority": 30
     }

ios/build/bots/chromium.mac/ios-simulator-full-configs.json

@@ -3,7 +3,7 @@
     "Runs tests on 64-bit iOS 11 and 12 tests on iPad, iPhone,",
     "@3x, and @2x on main waterfall ios-simulator-full-configs."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "is_component_build=false",
@@ -22,80 +22,80 @@
       "include": "eg_tests.json",
       "device type": "iPhone 7",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "eg_tests.json",
       "device type": "iPad Air 2",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "eg_tests.json",
       "device type": "iPhone X",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone X",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPad Air 2",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "eg_tests.json",
+      "device type": "iPhone 7",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "eg_tests.json",
+      "device type": "iPad Air 2",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "eg_tests.json",
+      "device type": "iPhone X",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "eg_cq_tests.json",
+      "device type": "iPhone X",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "eg_cq_tests.json",
+      "device type": "iPad Air 2",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     }
   ]

ios/build/bots/chromium.mac/ios-simulator-xcode-clang.json

@@ -4,7 +4,7 @@
     "This 'xcode build version' must exist in GOMA",
     "Build is performed with gn+ninja."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "use xcode build version": true,
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
@@ -14,7 +14,7 @@
     "symbol_level=0",
     "target_cpu=\"x64\"",
     "target_os=\"ios\"",
-    "use_goma=true",
+    "use_goma=false",
     "use_xcode_clang=true"
   ],
   "env": {

ios/build/bots/chromium.mac/ios-simulator.json

@@ -4,7 +4,7 @@
     "main and CQ ios-simulator.",
     "Note: Xcode 10 requires Mac OS 10.13.4 or higher, hence 'host os'."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "is_component_build=false",
@@ -23,80 +23,80 @@
       "include": "screen_size_dependent_tests.json",
       "device type": "iPhone 6s Plus",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "screen_size_dependent_tests.json",
       "device type": "iPhone 6s",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "common_tests.json",
       "device type": "iPhone 6s",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "screen_size_dependent_tests.json",
       "device type": "iPad Air 2",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     },
     {
       "include": "eg_cq_tests.json",
       "device type": "iPhone 6s",
       "os": "12.1",
-      "host os": "Mac-10.13.6",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPhone 6s Plus",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPhone 6s",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "common_tests.json",
+      "device type": "iPhone 6s",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "screen_size_dependent_tests.json",
+      "device type": "iPad Air 2",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
+      "pool":"Chrome",
+      "priority": 30
+    },
+    {
+      "include": "eg_cq_tests.json",
+      "device type": "iPhone 6s",
+      "os": "13.0",
+      "host os": "Mac-10.14.4",
       "pool":"Chrome",
-      "optional_dimensions": {
-          "60": [{
-            "host os": "Mac-10.14.4"
-          }],
-          "120": [{
-            "host os": "Mac-10.14.3"
-          }]
-      },
       "priority": 30
     }
   ]

ios/build/bots/chromium.webrtc.fyi/WebRTC Chromium FYI ios-device.json

@@ -3,7 +3,7 @@
     "Builder for 64-bit devices.",
     "Build is performed with gn+ninja."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",

ios/build/bots/chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator.json

@@ -2,7 +2,7 @@
   "comments": [
     "Runs tests on @3x, @2x, 64-bit phone, tablet, iOS 11."
   ],
-  "xcode build version": "10b61",
+  "xcode build version": "11m382q",
   "gn_args": [
     "goma_dir=\"$(goma_dir)\"",
     "ios_enable_code_signing=false",