chromium.fyi ios13-beta-simulator src-side migration for Chromium

* ci.star - ios13-beta-sim to run Chromium recipe
* mb_config.pyl - GN arguments for ios13-beta-sim
* testing/*.pyl, *.json - tests to bind to ios13-beta-sim
  * Replaced contents of ios-sim-cr-recipe with this as it is no
    longer needed. All introduced content (mixins, waterfall,
    test_suites) need a mapping, so I've replaced it as part of
    clean up as well.
* gn_isolate_map.pyl - updating all iOS test targets to generated
  scripts. Remains backwards compatible to iOS as required files
  are still there for iOS recipe consumption.
* BUILD.gn files - adding shard values for test targets that
  utilize parallelization via test runner.

Bug: 1055164
Change-Id: Id36ffdecd2935cacdf4825c99f26d2f6b561200d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2085118Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748770}

infra/config/buckets/ci.star

@@ -1176,6 +1176,10 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = 'ios13-beta-simulator',
+    executable = 'recipe:chromium',
+    properties = {
+        'xcode_build_version': '11c29',
+    },
 )
 
 ci.fyi_ios_builder(

infra/config/generated/cr-buildbucket.cfg

@@ -6954,11 +6954,12 @@ buckets: <
       dimensions: "cpu:x86-64"
       dimensions: "os:Mac"
       recipe: <
-        name: "ios/unified_builder_tester"
+        name: "chromium"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/master"
         properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
         properties_j: "mastername:\"chromium.fyi\""
+        properties_j: "xcode_build_version:\"11c29\""
       >
       execution_timeout_secs: 36000
       caches: <

ios/chrome/test/earl_grey/BUILD.gn

@@ -54,6 +54,8 @@ chrome_ios_eg_test("ios_chrome_reading_list_egtests") {
 
 chrome_ios_eg_test("ios_chrome_bookmarks_egtests") {
   deps = [ "//ios/chrome/browser/ui/bookmarks:eg_tests" ]
+
+  shards = 3
 }
 
 chrome_ios_eg_test("ios_chrome_signin_egtests") {
@@ -99,6 +101,8 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") {
     "//ios/chrome/browser/ui/toolbar:eg_tests",
     "//ios/chrome/browser/ui/webui:eg_tests",
   ]
+
+  shards = 2
 }
 
 chrome_ios_eg_test("ios_chrome_web_egtests") {

ios/chrome/test/earl_grey2/BUILD.gn

@@ -130,6 +130,8 @@ chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") {
     "//ios/chrome/browser/ui/webui:eg2_tests",
   ]
   data_deps = [ ":ios_chrome_eg2tests" ]
+
+  shards = 2
 }
 
 chrome_ios_eg2_test("ios_chrome_web_eg2tests_module") {

testing/buildbot/gn_isolate_map.pyl

@@ -895,148 +895,183 @@
   "ios_chrome_bookmarks_egtests": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_bookmarks_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_bookmarks_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_integration_egtests": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_integration_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_integration_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_reading_list_egtests": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_reading_list_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_reading_list_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_settings_egtests": {
     "args": [
       "--enable-features=ClearSyncedData",
     ],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_settings_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_settings_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_signin_egtests": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_signin_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_signin_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_translate_egtests": {
     "label": "//ios/chrome/test/earl_grey:ios_chrome_translate_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_translate_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_smoke_egtests": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_smoke_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_smoke_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_ui_egtests": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_ui_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_ui_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_unittests": {
     "args": [],
     "label": "//ios/chrome/test:ios_chrome_unittests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_unittests",
+    "type": "generated_script",
   },
   "ios_chrome_web_egtests": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey:ios_chrome_web_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_web_egtests",
+    "type": "generated_script",
   },
   "ios_chrome_bookmarks_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_bookmarks_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_bookmarks_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_chrome_integration_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_integration_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_integration_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_chrome_settings_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_settings_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_settings_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_chrome_signin_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_signin_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_signin_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_chrome_smoke_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_smoke_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_smoke_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_chrome_ui_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_ui_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_ui_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_chrome_web_eg2tests_module": {
     "args": [],
     "label": "//ios/chrome/test/earl_grey2:ios_chrome_web_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_chrome_web_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_crash_xcuitests_module": {
     "args": [],
     "label": "//third_party/crashpad/crashpad/test/ios:ios_crash_xcuitests_module",
-    "type": "raw",
-  },
-  "ios_web_shell_eg2tests_module": {
-    "args": [],
-    "label": "//ios/web/shell/test:ios_web_shell_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_crash_xcuitests_module",
+    "type": "generated_script",
   },
   "ios_components_unittests": {
     "args": [],
     "label": "//ios/components:ios_components_unittests",
-    "type": "raw",
+    "script": "bin/run_ios_components_unittests",
+    "type": "generated_script",
   },
   "ios_net_unittests": {
     "args": [],
     "label": "//ios/net:ios_net_unittests",
-    "type": "raw",
+    "script": "bin/run_ios_net_unittests",
+    "type": "generated_script",
   },
   "ios_remoting_unittests": {
     "args": [],
     "label": "//remoting/ios:ios_remoting_unittests",
-    "type": "raw",
+    "script": "bin/run_ios_remoting_unittests",
+    "type": "generated_script",
   },
   "ios_showcase_egtests": {
     "args": [],
     "label": "//ios/showcase:ios_showcase_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_showcase_egtests",
+    "type": "generated_script",
   },
   "ios_showcase_eg2tests_module": {
     "args":[],
     "label": "//ios/showcase:ios_showcase_eg2tests_module",
-    "type": "raw",
+    "script": "bin/run_ios_showcase_eg2tests_module",
+    "type": "generated_script",
+  },
+  "ios_testing_unittests": {
+    "args": [],
+    "label": "//ios/testing:ios_testing_unittests",
+    "script": "bin/run_ios_testing_unittests",
+    "type": "generated_script",
   },
   "ios_web_inttests": {
     "args": [],
     "label": "//ios/web:ios_web_inttests",
-    "type": "raw",
+    "script": "bin/run_ios_web_inttests",
+    "type": "generated_script",
+  },
+  "ios_web_shell_eg2tests_module": {
+    "args": [],
+    "label": "//ios/web/shell/test:ios_web_shell_eg2tests_module",
+    "script": "bin/run_ios_web_shell_eg2tests_module",
+    "type": "generated_script",
   },
   "ios_web_shell_egtests": {
     "args": [],
     "label": "//ios/web/shell/test:ios_web_shell_egtests",
-    "type": "raw",
+    "script": "bin/run_ios_web_shell_egtests",
+    "type": "generated_script",
   },
   "ios_web_unittests": {
     "args": [],
     "label": "//ios/web:ios_web_unittests",
-    "type": "raw",
+    "script": "bin/run_ios_web_unittests",
+    "type": "generated_script",
   },
   "ios_web_view_inttests": {
     "args": [],
     "label": "//ios/web_view:ios_web_view_inttests",
-    "type": "raw",
+    "script": "bin/run_ios_web_view_inttests",
+    "type": "generated_script",
   },
   "ios_web_view_unittests": {
     "args": [],
     "label": "//ios/web_view:ios_web_view_unittests",
-    "type": "raw",
+    "script": "bin/run_ios_web_view_unittests",
+    "type": "generated_script",
   },
   "ipc_tests": {
     "label": "//ipc:ipc_tests",
@@ -1290,11 +1325,6 @@
     "label": "//third_party/opus:opus_tests",
     "type": "console_test_launcher",
   },
-  "ios_testing_unittests": {
-    "args": [],
-    "label": "//ios/testing:ios_testing_unittests",
-    "type": "raw",
-  },
   "openscreen_unittests": {
     "label": "//chrome/browser/media/router:openscreen_unittests",
     "type": "console_test_launcher",

testing/buildbot/mixins.pyl

@@ -227,18 +227,16 @@
       },
     },
   },
-  'host_mac_10.14': {
+  'intel_iris_5100': {
     'swarming': {
       'dimensions': {
-        'host os': 'Mac-10.14.6',
+        'gpu': '8086:0a2e',
       },
     },
   },
-  'intel_iris_5100': {
+  'ios_swarming_account': {
     'swarming': {
-      'dimensions': {
-        'gpu': '8086:0a2e',
-      },
+      'service_account': 'ios-isolated-tester@chops-service-accounts.iam.gserviceaccount.com'
     },
   },
   'kitkat': {
@@ -475,6 +473,17 @@
       },
     },
   },
+  'mac_toolchain': {
+    'swarming': {
+      'cipd_packages': [
+        {
+          "cipd_package": 'infra/tools/mac_toolchain/${platform}',
+          'location': '.',
+          'revision': 'git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a',
+        },
+      ],
+    },
+  },
   'marshmallow': {
     'swarming': {
       'dimensions': {
@@ -536,6 +545,14 @@
       },
     },
   },
+  'out_dir_arg': {
+    '$mixin_append': {
+      'args': [
+        '--out-dir',
+        '${ISOLATED_OUTDIR}'
+      ],
+    },
+  },
   'pie-x86-emulator': {
     '$mixin_append': {
       'args': [
@@ -734,16 +751,12 @@
   },
   'xcode_11c29': {
     'swarming': {
-      'dimensions': {
-        'xcode_build_version': '11c29',
-      },
-    },
-  },
-  'xcode_parallelization': {
-    'swarming': {
-      'dimensions': {
-        'xcode_parallelization': 'true',
-      },
+      'named_caches': [
+        {
+          'name': 'xcode_ios_11c29',
+          'path': 'Xcode.app',
+        },
+      ],
     },
   },
 }

testing/buildbot/test_suites.pyl

@@ -2642,39 +2642,236 @@
       'ios_components_unittests': {},
     },
 
+    'ios_common_tests': {
+      'boringssl_crypto_tests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'boringssl_ssl_tests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'crypto_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'google_apis_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_components_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_net_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_remoting_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_testing_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'net_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'services_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'sql_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'url_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+    },
+
     'ios_eg2_tests': {
+      'ios_chrome_bookmarks_eg2tests_module': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
       'ios_chrome_integration_eg2tests_module': {
-        'app': 'ios_chrome_integration_eg2tests_module',
-        'host': 'ios_chrome_eg2tests',
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
       },
       'ios_chrome_settings_eg2tests_module': {
-        'app': 'ios_chrome_settings_eg2tests_module',
-        'host': 'ios_chrome_eg2tests',
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
       },
       'ios_chrome_signin_eg2tests_module': {
-        'app': 'ios_chrome_signin_eg2tests_module',
-        'host': 'ios_chrome_eg2tests',
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
       },
       'ios_chrome_smoke_eg2tests_module': {
-        'app': 'ios_chrome_smoke_eg2tests_module',
-        'host': 'ios_chrome_eg2tests',
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
       },
       'ios_chrome_ui_eg2tests_module': {
-        'app': 'ios_chrome_ui_eg2tests_module',
-        'host': 'ios_chrome_eg2tests',
-        'shards': 2,
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        },
+        'swarming': {
+          'shards': 2,
+        }
       },
       'ios_chrome_web_eg2tests_module': {
-        'app': 'ios_chrome_web_eg2tests_module',
-        'host': 'ios_chrome_eg2tests',
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
       },
       'ios_showcase_eg2tests_module': {
-        'app': 'ios_showcase_eg2tests_module',
-        'host': 'ios_showcase_eg2tests',
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
       },
       'ios_web_shell_eg2tests_module': {
-        'app': 'ios_web_shell_eg2tests_module',
-        'host': 'ios_web_shell_eg2tests',
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+    },
+
+    'ios_eg_cq_tests': {
+      'ios_chrome_integration_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        },
+        'swarming': {
+          'shards': 3,
+        }
+      },
+      'ios_chrome_signin_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        },
+      },
+      'ios_chrome_ui_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        },
+        'swarming': {
+          'shards': 5,
+        }
+      },
+      'ios_web_shell_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+    },
+
+    'ios_eg_tests': {
+      'ios_chrome_bookmarks_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_chrome_reading_list_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_chrome_settings_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        },
+        'swarming': {
+          'shards': 3,
+        }
+      },
+      'ios_chrome_translate_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_chrome_web_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_showcase_egtests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+    },
+
+    'ios_screen_size_dependent_tests': {
+      'base_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'components_unittests': {
+        'merge': {
+          'args': [],
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'gfx_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_chrome_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_web_inttests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_web_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_web_view_inttests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ios_web_view_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'skia_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
+      },
+      'ui_base_unittests': {
+        'merge': {
+          'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
+        }
       },
     },
 
@@ -4509,31 +4706,48 @@
 
   'matrix_compound_suites': {
 
-    # This is a sample and is not functional
-    'ios_simulator_cr_recipe_gtests': {
-      'ios_eg2_tests': {
-        'swarming': {
-          'dimension_sets': [
-            {
-              'device type': 'iPhone X',
-              'os': '13.3',
-            },
-            {
-              'device type': 'iPhone 7',
-              'os': '13.3',
-            },
-            {
-              'device type': 'iPhone X',
-              'os': '12.4',
-            },
-            {
-              'device type': 'iPad (6th generation)',
-              'os': '12.4',
-            },
-          ],
-        },
+    'ios13_beta_simulator_gtests': {
+      'ios_common_tests': {
+        'variants': [
+          'SIM_IPHONE_X_13_3',
+          'SIM_IPHONE_X_12_4',
+        ],
       },
-    },
-
+      'ios_eg2_tests': {
+        'variants': [
+          'SIM_IPHONE_X_13_3',
+          'SIM_IPHONE_7_13_3',
+          'SIM_IPAD_6_GEN_13_3',
+          'SIM_IPHONE_X_12_4',
+          'SIM_IPAD_6_GEN_12_4',
+        ]
+      },
+      'ios_eg_cq_tests': {
+        'variants': [
+          'SIM_IPHONE_X_13_3',
+          'SIM_IPAD_PRO_13_3',
+          'SIM_IPHONE_X_12_4',
+          'SIM_IPAD_PRO_12_4',
+        ]
+      },
+      'ios_eg_tests': {
+        'variants': [
+          'SIM_IPHONE_X_13_3',
+          'SIM_IPAD_AIR_3RD_GEN_13_3',
+          'SIM_IPHONE_X_12_4',
+          'SIM_IPAD_AIR_3RD_GEN_12_4',
+        ]
+      },
+      'ios_screen_size_dependent_tests': {
+        'variants': [
+          'SIM_IPHONE_6S_PLUS_13_3',
+          'SIM_IPHONE_X_13_3',
+          'SIM_IPAD_AIR_2_13_3',
+          'SIM_IPHONE_6S_PLUS_12_4',
+          'SIM_IPHONE_X_12_4',
+          'SIM_IPAD_AIR_2_12_4',
+        ],
+      },
+    }
   }
 }

testing/buildbot/variants.pyl

@@ -8,4 +8,122 @@
 # * comments are allowed, using '#' syntax; and
 # * trailing commas are allowed.
 
-{}
+{
+    'SIM_IPAD_AIR_2_12_4': {
+        'args': [
+            '--platform',
+            'iPad Air 2',
+            '--version',
+            '12.4'
+        ],
+        'identifier': 'iPad Air 2 12.4'
+    },
+    'SIM_IPAD_AIR_2_13_3': {
+        'args': [
+            '--platform',
+            'iPad Air 2',
+            '--version',
+            '13.3'
+        ],
+        'identifier': 'iPad Air 2 13.3'
+    },
+    'SIM_IPAD_AIR_3RD_GEN_12_4': {
+        'args': [
+            '--platform',
+            'iPad Air (3rd generation)',
+            '--version',
+            '12.4'
+        ],
+        'identifier': 'iPad Air (3rd generation) 12.4'
+    },
+    'SIM_IPAD_AIR_3RD_GEN_13_3': {
+        'args': [
+            '--platform',
+            'iPad Air (3rd generation)',
+            '--version',
+            '13.3'
+        ],
+        'identifier': 'iPad Air (3rd generation) 13.3'
+    },
+    'SIM_IPAD_PRO_12_4': {
+        'args': [
+          '--platform',
+          'iPad Pro (12.9-inch)',
+          '--version',
+          '12.4',
+        ],
+        'identifier': 'iPad Pro (12.9-inch) 12.4'
+    },
+    'SIM_IPAD_PRO_13_3': {
+        'args': [
+          '--platform',
+          'iPad Pro (12.9-inch)',
+          '--version',
+          '13.3',
+        ],
+        'identifier': 'iPad Pro (12.9-inch) 13.3'
+    },
+    'SIM_IPAD_6_GEN_12_4': {
+        'args': [
+          '--platform',
+          'iPad (6th generation)',
+          '--version',
+          '12.4',
+        ],
+        'identifier': 'iPad (6th generation) 12.4'
+    },
+    'SIM_IPAD_6_GEN_13_3': {
+        'args': [
+          '--platform',
+          'iPad (6th generation)',
+          '--version',
+          '13.3',
+        ],
+        'identifier': 'iPad (6th generation) 13.3'
+    },
+    'SIM_IPHONE_6S_PLUS_12_4': {
+        'args': [
+            '--platform',
+            'iPhone 6s Plus',
+            '--version',
+            '12.4',
+        ],
+        'identifier': 'iPhone 6s Plus 12.4'
+    },
+    'SIM_IPHONE_6S_PLUS_13_3': {
+        'args': [
+            '--platform',
+            'iPhone 6s Plus',
+            '--version',
+            '13.3',
+        ],
+        'identifier': 'iPhone 6s Plus 13.3'
+    },
+    'SIM_IPHONE_7_13_3': {
+        'args': [
+            '--platform',
+            'iPhone 7',
+            '--version',
+            '13.3',
+        ],
+        'identifier': 'iPhone 7 13.3'
+    },
+    'SIM_IPHONE_X_12_4': {
+        'args': [
+            '--platform',
+            'iPhone X',
+            '--version',
+            '12.4',
+        ],
+        'identifier': 'iPhone X 12.4'
+    },
+    'SIM_IPHONE_X_13_3': {
+        'args': [
+            '--platform',
+            'iPhone X',
+            '--version',
+            '13.3',
+        ],
+        'identifier': 'iPhone X 13.3'
+    },
+}

testing/buildbot/waterfalls.pyl

@@ -1775,15 +1775,19 @@
           'gtest_tests': 'ios_code_coverage_gtests',
         },
       },
-      'ios-simulator-cr-recipe': {
+      'ios13-beta-simulator': {
+        'additional_compile_targets': [
+          'all',
+        ],
         'mixins': [
-          'chrome-swarming-pool',
-          'host_mac_10.14',
+          'ios_swarming_account',
+          'mac_10.14',
+          'mac_toolchain',
+          'out_dir_arg',
           'xcode_11c29',
-          'xcode_parallelization',
         ],
         'test_suites': {
-          'gtest_tests': 'ios_simulator_cr_recipe_gtests',
+          'gtest_tests': 'ios13_beta_simulator_gtests'
         },
       },
       'linux-annotator-rel': {

tools/mb/mb_config.pyl

@@ -235,6 +235,7 @@
       'fuchsia-fyi-arm64-rel': 'release_bot_fuchsia_arm64',
       'fuchsia-fyi-x64-dbg': 'debug_bot_fuchsia',
       'fuchsia-fyi-x64-rel': 'release_bot_fuchsia',
+      'ios13-beta-simulator': 'ios_simulator_debug_static_bot',
       'ios-simulator': 'ios_error',
       'ios-simulator-code-coverage': 'clang_code_coverage_ios',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot',