Decomm ios-webview, repurpose for ios13-beta-simulator, create ios12-beta tybot

infra cl: https://chrome-internal-review.googlesource.com/c/infradata/config/+/914125

Bug: 936908
Change-Id: I15d82cdf4ca0edb78a7258b6477deaaa0941c6f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1496656
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638299}

infra/config/cr-buildbucket.cfg

@@ -1535,9 +1535,9 @@ buckets {
     builders { mixins: "ios-ci" name: "ios-simulator-xcode-clang" }
     builders { mixins: "ios-ci" name: "ios-slimnav" }
     builders { mixins: "ios-ci" name: "ios-uirefresh-simulator" }
-    builders { mixins: "ios-ci" name: "ios-webview" }
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios-simulator-cronet" }
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-beta-simulator" }
+    builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-beta-simulator" }
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-device" }
     builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-simulator" }
 
@@ -3366,12 +3366,13 @@ buckets {
     builders { mixins: "ios-try" name: "ios-simulator" }
     builders { mixins: "ios-try" name: "ios-simulator-cronet" }
     builders { mixins: "ios-try" name: "ios-uirefresh-simulator" }
+    builders { mixins: "ios-try" name: "ios12-beta-simulator" }
+    builders { mixins: "ios-try" name: "ios13-beta-simulator" }
     builders { mixins: "ios-try" name: "ios12-sdk-simulator" }
     builders { mixins: "ios-try" name: "ios-simulator-full-configs" }
     builders { mixins: "ios-try" name: "ios-simulator-eg" }
     builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }
     builders { mixins: "ios-try" name: "ios-slimnav" }
-    builders { mixins: "ios-try" name: "ios-webview" }
     builders { mixins: "mac-angle-try" name: "mac_angle_compile_dbg_ng" }
     builders { mixins: "mac-angle-try" name: "mac_angle_dbg_ng" }
     builders { mixins: "mac-angle-try" name: "mac_angle_rel_ng" }

infra/config/luci-milo.cfg

@@ -482,11 +482,6 @@ consoles {
     category: "chromium.mac|ios"
     short_name: "ui"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/ios-webview"
-    category: "chromium.mac|ios"
-    short_name: "web"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-slimnav"
     category: "chromium.mac|ios"
@@ -893,11 +888,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/ios-uirefresh-simulator"
     category: "ios"
     short_name: "ui"
-  }
-   builders {
-    name: "buildbucket/luci.chromium.ci/ios-webview"
-    category: "ios"
-    short_name: "web"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-slimnav"
@@ -2628,6 +2618,11 @@ consoles {
     name: "buildbucket/luci.chromium.ci/ios-device-goma-canary-clobber"
     category: "goma|ios"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios12-beta-simulator"
+    category: "iOS|iOS12"
+    short_name: "beta"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios12-sdk-device"
     category: "iOS|iOS12"
@@ -2638,6 +2633,11 @@ consoles {
     category: "iOS|iOS12"
     short_name: "sim"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-beta-simulator"
+    category: "iOS|iOS13"
+    short_name: "ios13"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Jumbo Linux x64"
     category: "jumbo"
@@ -4111,13 +4111,16 @@ consoles {
     name: "buildbucket/luci.chromium.try/ios-simulator-xcode-clang"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/ios12-sdk-simulator"
+    name: "buildbucket/luci.chromium.try/ios12-beta-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/ios-slimnav"
+    name: "buildbucket/luci.chromium.try/ios13-beta-simulator"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/ios-webview"
+    name: "buildbucket/luci.chromium.try/ios12-sdk-simulator"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/ios-slimnav"
   }
   builders {
     name: "buildbucket/luci.chromium.try/mac-rel"
@@ -4805,16 +4808,16 @@ consoles {
     category: "chromium.mac"
     short_name: "ui"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/ios-webview"
-    category: "chromium.mac"
-    short_name: "web"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios-slimnav"
     category: "chromium.mac"
     short_name: "slim"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios12-beta-simulator"
+    category: "chromium.fyi|12"
+    short_name: "beta"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios12-sdk-device"
     category: "chromium.fyi|12"
@@ -4825,4 +4828,9 @@ consoles {
     category: "chromium.fyi|12"
     short_name: "sim"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ios13-beta-simulator"
+    category: "chromium.fyi|13"
+    short_name: "ios13"
+  }
 }

infra/config/luci-scheduler.cfg

@@ -326,8 +326,8 @@ trigger {
   triggers: "ios-simulator-xcode-clang"
   triggers: "ios-slimnav"
   triggers: "ios-uirefresh-simulator"
-  triggers: "ios-webview"
   triggers: "ios12-beta-simulator"
+  triggers: "ios13-beta-simulator"
   triggers: "ios12-sdk-device"
   triggers: "ios12-sdk-simulator"
   triggers: "linux-annotator-rel"
@@ -1246,32 +1246,32 @@ job {
 }
 
 job {
-  id: "ios-webview"
+  id: "ios-simulator-xcode-clang"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "ios-webview"
+    builder: "ios-simulator-xcode-clang"
   }
 }
 
 job {
-  id: "ios-simulator-xcode-clang"
+  id: "ios12-beta-simulator"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "ios-simulator-xcode-clang"
+    builder: "ios12-beta-simulator"
   }
 }
 
 job {
-  id: "ios12-beta-simulator"
+  id: "ios13-beta-simulator"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "ios12-beta-simulator"
+    builder: "ios13-beta-simulator"
   }
 }
 

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

+{
+  "comments": [
+    "Run tests on iOS13beta track on 64-bit iOS 13 simulators.",
+    "Note: Xcode 11 will requires OSX 10.14."
+  ],
+  "xcode build version": "10b61",
+  "gn_args": [
+    "goma_dir=\"$(goma_dir)\"",
+    "is_component_build=false",
+    "is_debug=true",
+    "symbol_level=1",
+    "target_cpu=\"x64\"",
+    "target_os=\"ios\"",
+    "use_goma=true"
+  ],
+  "tests": [
+  ]
+}

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

-{
-  "comments": [
-    "Hold back the ios_deployment_target to iOS10 for web_view and related",
-    "tests, only testing on iOS 10.3 simulator."
-  ],
-  "xcode build version": "10b61",
-  "gn_args": [
-    "goma_dir=\"$(goma_dir)\"",
-    "ios_deployment_target=\"10.0\"",
-    "is_component_build=false",
-    "is_debug=true",
-    "symbol_level=1",
-    "target_cpu=\"x64\"",
-    "additional_target_cpus=[\"x86\"]",
-    "target_os=\"ios\"",
-    "use_goma=true"
-  ],
-  "configuration": "Debug",
-  "tests": [
-    {
-      "app": "ios_web_view_unittests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "ios_web_view_inttests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "ios_components_unittests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "components_unittests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "net_unittests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "ios_net_unittests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "ios_web_unittests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "ios_web_inttests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30
-    },
-    {
-      "app": "ios_web_shell_egtests",
-      "device type": "iPhone 5s",
-      "host os": "Mac-10.13.6",
-      "pool": "Chrome",
-      "os": "10.3",
-      "priority": 30,
-      "xctest": true
-    }
-  ]
-}