[ios] Swap fyi/ios11-beta-simulator with mac/ios-webview

While ios/chrome will soon be dropping iOS10, ios-web will need to continue
to support the old versions SDK.

Bug: 894099
Change-Id: I9743fc39eccf7493ee4df8f09bd9313ee05e84ad
Reviewed-on: https://chromium-review.googlesource.com/c/1296678
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602138}

infra/config/global/cr-buildbucket.cfg

@@ -1477,6 +1477,7 @@ buckets {
     builders { mixins: "ios-ci" name: "ios-simulator-full-configs" }
     builders { mixins: "ios-ci" name: "ios-simulator-xcode-clang" }
     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: "ios12-sdk-device" }
@@ -2267,12 +2268,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "ios11-beta-simulator"
-      dimensions: "os:Mac-10.13"
-      dimensions: "cores:4"
-      mixins: "fyi-ci"
-    }
     builders {
       name: "chromeos-amd64-generic-rel-goma-canary"
       dimensions: "os:Ubuntu-14.04"

infra/config/global/luci-milo.cfg

@@ -467,6 +467,10 @@ consoles {
     name: "buildbucket/luci.chromium.ci/ios-uirefresh-simulator"
     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/Linux Builder"
@@ -862,6 +866,11 @@ consoles {
     category: "ios"
     short_name: "ui"
   }
+   builders {
+    name: "buildbucket/luci.chromium.ci/ios-webview"
+    category: "ios"
+    short_name: "web"
+  }
 }
 
 consoles {
@@ -2589,10 +2598,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/ios-simulator"
     category: "iOS"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/ios11-beta-simulator"
-    category: "iOS|beta"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios12-sdk-device"
     category: "iOS|iOS12"
@@ -2993,11 +2998,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/ios-simulator"
     category: "iOS"
   }
-  builders {
-    name: "buildbot/chromium.fyi/ios11-beta-simulator"
-    name: "buildbucket/luci.chromium.ci/ios11-beta-simulator"
-    category: "iOS|beta"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios12-sdk-device"
     category: "iOS|iOS12"

infra/config/global/luci-scheduler.cfg

@@ -296,7 +296,7 @@ trigger {
   triggers: "ios-simulator-full-configs"
   triggers: "ios-simulator-xcode-clang"
   triggers: "ios-uirefresh-simulator"
-  triggers: "ios11-beta-simulator"
+  triggers: "ios-webview"
   triggers: "ios12-beta-simulator"
   triggers: "ios12-sdk-device"
   triggers: "ios12-sdk-simulator"
@@ -1135,6 +1135,16 @@ job {
   }
 }
 
+job {
+  id: "ios-webview"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-webview"
+  }
+}
+
 job {
   id: "ios-simulator-xcode-clang"
   acl_sets: "default"
@@ -4170,16 +4180,6 @@ job {
   }
 }
 
-job {
-  id: "ios11-beta-simulator"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "ios11-beta-simulator"
-  }
-}
-
 job {
   id: "CFI Linux CF"
   acl_sets: "default"

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

-{
-  "comments": [
-    "Run tests on iOS11beta track on 64-bit iOS 11 simulators."
-  ],
-  "xcode build version": "9C40b",
-  "gn_args": [
-    "goma_dir=\"$(goma_dir)\"",
-    "additional_target_cpus=[\"x86\"]",
-    "is_component_build=false",
-    "is_debug=true",
-    "symbol_level=1",
-    "target_cpu=\"x64\"",
-    "target_os=\"ios\"",
-    "use_goma=true"
-  ]
-}

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": "10a254a",
+  "gn_args": [
+    "goma_dir=\"$(goma_dir)\"",
+    "ios_deployment_target=\"10.0\"",
+    "is_component_build=false",
+    "is_debug=true",
+    "symbol_level=1",
+    "target_cpu=\"x64\"",
+    "target_os=\"ios\"",
+    "use_goma=true"
+  ],
+  "configuration": "Debug",
+  "tests": [
+    {
+      "app": "ios_web_view_unittests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "ios_web_view_inttests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "ios_components_unittests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "components_unittests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "net_unittests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "ios_net_unittests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "ios_web_unittests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "ios_web_inttests",
+      "device type": "iPhone 5s",
+      "os": "10.3"
+    },
+    {
+      "app": "ios_web_shell_egtests",
+      "device type": "iPhone 5s",
+      "os": "10.3",
+      "xctest": true
+    }
+  ]
+}