Revert "[iOS] Remove xcode clang bots"

This reverts commit 3893c26b.

Reason for revert: Dangling reference to ios-simulator-xcode-clang.json.

https://sheriff-o-matic.appspot.com/chromium/examine/chromium.read%20build%20config

Original change's description:
> [iOS] Remove xcode clang bots
> 
> Bug: 1049646
> Change-Id: If024c2185409167031bcdaf3a801e73cb1c61b0b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2042679
> Reviewed-by: Justin Cohen <justincohen@chromium.org>
> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
> Commit-Queue: Mike Dougherty <michaeldo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#741519}

TBR=justincohen@chromium.org,martiniss@chromium.org,michaeldo@chromium.org

Change-Id: I2e0e630a1c4f5ed5706a40a34a5c479e1dff31f1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1049646
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2057583Reviewed-by: Chris Mumford <cmumford@google.com>
Commit-Queue: Chris Mumford <cmumford@google.com>
Cr-Commit-Position: refs/heads/master@{#741528}

docs/ios/infra.md

@@ -83,21 +83,25 @@ executed in parallel.
 Try bots are bots which test proposed patches which are not yet committed.
 
 Request [try job access] in order to trigger try jobs against your patch. The
-relevant try bots for an iOS patch are `ios-device` and `ios-simulator`. These
-bots can be found on the Mac-specific [try server]. A try job is said to succeed
-when the build passes (i.e. when the bot successfully compiles and tests the
-patch).
+relevant try bots for an iOS patch are `ios-device`, `ios-device-xcode-clang`,
+`ios-simulator`, and `ios-simulator-xcode-clang`. These bots can be found on
+the Mac-specific [try server]. A try job is said to succeed when the build
+passes (i.e. when the bot successfully compiles and tests the patch).
 
-`ios-device` compiles for the iOS device architecture (ARM) and runs no tests.
-A build is considered successful so long as compilation is successful.
+`ios-device` and `ios-device-xcode-clang` both compile for the iOS device
+architecture (ARM), and neither run any tests. A build is considered successful
+so long as compilation is successful.
 
-`ios-simulator` compiles for the iOS simulator architecture (x86), and runs
-tests in the iOS [simulator]. A build is considered successful when both
-compilation and all configured tests succeed.
+`ios-simulator` and `ios-simulator-xcode-clang` both compile for the iOS
+simulator architecture (x86), and run tests in the iOS [simulator]. A build is
+considered successful when both compilation and all configured test succeed.
 
 `ios-device` and `ios-simulator` both compile using the version of [clang]
 defined by the `CLANG_REVISION` in the Chromium tree.
 
+`ios-device-xcode-clang` and `ios-simulator-xcode-clang` both compile using the
+version of clang that ships with Xcode.
+
 ### Scheduling try jobs using buildbucket
 
 Triggering a try job and collecting its results is accomplished using

infra/config/buckets/ci.star

@@ -1702,6 +1702,10 @@ ci.mac_ios_builder(
     name = 'ios-device',
 )
 
+ci.mac_ios_builder(
+    name = 'ios-device-xcode-clang',
+)
+
 ci.mac_ios_builder(
     name = 'ios-simulator-full-configs',
 )
@@ -1710,6 +1714,10 @@ ci.mac_ios_builder(
     name = 'ios-simulator-noncq',
 )
 
+ci.mac_ios_builder(
+    name = 'ios-simulator-xcode-clang',
+)
+
 
 ci.memory_builder(
     name = 'Android CFI',

infra/config/buckets/try.star

@@ -813,6 +813,10 @@ try_.chromium_mac_ios_builder(
     name = 'ios-device',
 )
 
+try_.chromium_mac_ios_builder(
+    name = 'ios-device-xcode-clang',
+)
+
 try_.chromium_mac_ios_builder(
     name = 'ios-simulator-cr-recipe',
     executable = 'recipe:chromium_trybot',
@@ -852,6 +856,10 @@ try_.chromium_mac_ios_builder(
     ),
 )
 
+try_.chromium_mac_ios_builder(
+    name = 'ios-simulator-xcode-clang',
+)
+
 try_.chromium_mac_ios_builder(
     name = 'ios13-beta-simulator',
 )

infra/config/consoles/chromium.mac.star

@@ -63,5 +63,15 @@ luci.console_view(
             category = 'ios|default',
             short_name = 'non',
         ),
+        luci.console_view_entry(
+            builder = 'ci/ios-device-xcode-clang',
+            category = 'ios|xcode',
+            short_name = 'dev',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/ios-simulator-xcode-clang',
+            category = 'ios|xcode',
+            short_name = 'sim',
+        ),
     ],
 )

infra/config/consoles/luci.chromium.try.star

@@ -138,9 +138,11 @@ luci.list_view(
         'try/linux-viz-rel',
         'try/linux-wpt-fyi-rel',
         'try/ios-device',
+        'try/ios-device-xcode-clang',
         'try/ios-simulator',
         'try/ios-simulator-cronet',
         'try/ios-simulator-eg',
+        'try/ios-simulator-xcode-clang',
         'try/ios13-sdk-simulator',
         'try/mac-angle-rel',
         'try/mac-rel',

infra/config/consoles/main.star

@@ -174,6 +174,16 @@ luci.console_view(
             category = 'chromium.mac|ios|default',
             short_name = 'non',
         ),
+        luci.console_view_entry(
+            builder = 'ci/ios-device-xcode-clang',
+            category = 'chromium.mac|ios|xcode',
+            short_name = 'dev',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/ios-simulator-xcode-clang',
+            category = 'chromium.mac|ios|xcode',
+            short_name = 'sim',
+        ),
         luci.console_view_entry(
             builder = 'ci/Linux Builder',
             category = 'chromium.linux|release',

infra/config/consoles/sheriff.ios.star

@@ -25,6 +25,16 @@ luci.console_view(
             category = 'chromium.mac',
             short_name = 'non',
         ),
+        luci.console_view_entry(
+            builder = 'ci/ios-device-xcode-clang',
+            category = 'chromium.mac|xcode',
+            short_name = 'dev',
+        ),
+        luci.console_view_entry(
+            builder = 'ci/ios-simulator-xcode-clang',
+            category = 'chromium.mac|xcode',
+            short_name = 'sim',
+        ),
         luci.console_view_entry(
             builder = 'ci/ios13-sdk-device',
             category = 'chromium.fyi|13',

infra/config/consoles/tryserver.chromium.mac.star

@@ -17,10 +17,12 @@ luci.list_view(
         'try/gpu-try-mac-amd-retina-dbg',
         'try/gpu-try-mac-intel-dbg',
         'try/ios-device',
+        'try/ios-device-xcode-clang',
         'try/ios-simulator-cr-recipe',
         'try/ios-simulator-cronet',
         'try/ios-simulator-full-configs',
         'try/ios-simulator-noncq',
+        'try/ios-simulator-xcode-clang',
         'try/ios13-beta-simulator',
         'try/ios13-sdk-simulator',
         'try/mac-osxbeta-rel',

infra/config/generated/commit-queue.cfg

@@ -655,6 +655,10 @@ config_groups: <
         name: "chromium/try/ios-device"
         includable_only: true
       >
+      builders: <
+        name: "chromium/try/ios-device-xcode-clang"
+        includable_only: true
+      >
       builders: <
         name: "chromium/try/ios-simulator"
       >
@@ -681,6 +685,10 @@ config_groups: <
         name: "chromium/try/ios-simulator-noncq"
         includable_only: true
       >
+      builders: <
+        name: "chromium/try/ios-simulator-xcode-clang"
+        includable_only: true
+      >
       builders: <
         name: "chromium/try/ios13-beta-simulator"
         includable_only: true

infra/config/generated/cr-buildbucket.cfg

@@ -6772,6 +6772,28 @@ buckets: <
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "ios-device-xcode-clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device-xcode-clang"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "ios/unified_builder_tester"
+        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.mac\""
+      >
+      execution_timeout_secs: 10800
+      caches: <
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      >
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    >
     builders: <
       name: "ios-simulator"
       swarming_host: "chromium-swarm.appspot.com"
@@ -6909,6 +6931,28 @@ buckets: <
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
     >
+    builders: <
+      name: "ios-simulator-xcode-clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-xcode-clang"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "ios/unified_builder_tester"
+        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.mac\""
+      >
+      execution_timeout_secs: 10800
+      caches: <
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      >
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+    >
     builders: <
       name: "ios-webkit-tot"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15573,6 +15617,36 @@ buckets: <
         value: 5
       >
     >
+    builders: <
+      name: "ios-device-xcode-clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-device-xcode-clang"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "ios/try"
+        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:\"tryserver.chromium.mac\""
+      >
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches: <
+        name: "win_toolchain"
+        path: "win_toolchain"
+      >
+      caches: <
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      >
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage: <
+        value: 5
+      >
+    >
     builders: <
       name: "ios-simulator"
       swarming_host: "chromium-swarm.appspot.com"
@@ -15755,6 +15829,36 @@ buckets: <
         value: 5
       >
     >
+    builders: <
+      name: "ios-simulator-xcode-clang"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builder:ios-simulator-xcode-clang"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      recipe: <
+        name: "ios/try"
+        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:\"tryserver.chromium.mac\""
+      >
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      caches: <
+        name: "win_toolchain"
+        path: "win_toolchain"
+      >
+      caches: <
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
+      >
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage: <
+        value: 5
+      >
+    >
     builders: <
       name: "ios13-beta-simulator"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -7519,6 +7519,16 @@ consoles: <
     category: "ios|default"
     short_name: "non"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/ios-device-xcode-clang"
+    category: "ios|xcode"
+    short_name: "dev"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/ios-simulator-xcode-clang"
+    category: "ios|xcode"
+    short_name: "sim"
+  >
   header: <
     oncalls: <
       name: "Chromium"
@@ -10627,6 +10637,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.chromium.try/ios-device"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try/ios-device-xcode-clang"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try/ios-simulator"
   >
@@ -10636,6 +10649,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.chromium.try/ios-simulator-eg"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try/ios-simulator-xcode-clang"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try/ios13-sdk-simulator"
   >
@@ -10931,6 +10947,16 @@ consoles: <
     category: "chromium.mac|ios|default"
     short_name: "non"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/ios-device-xcode-clang"
+    category: "chromium.mac|ios|xcode"
+    short_name: "dev"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/ios-simulator-xcode-clang"
+    category: "chromium.mac|ios|xcode"
+    short_name: "sim"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Linux Builder"
     category: "chromium.linux|release"
@@ -12412,6 +12438,16 @@ consoles: <
     category: "chromium.mac"
     short_name: "non"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/ios-device-xcode-clang"
+    category: "chromium.mac|xcode"
+    short_name: "dev"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/ios-simulator-xcode-clang"
+    category: "chromium.mac|xcode"
+    short_name: "sim"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
     category: "chromium.fyi|13"
@@ -13292,6 +13328,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.chromium.try/ios-device"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try/ios-device-xcode-clang"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try/ios-simulator-cr-recipe"
   >
@@ -13304,6 +13343,9 @@ consoles: <
   builders: <
     name: "buildbucket/luci.chromium.try/ios-simulator-noncq"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try/ios-simulator-xcode-clang"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try/ios13-beta-simulator"
   >

infra/config/generated/luci-scheduler.cfg

@@ -5375,6 +5375,15 @@ job: <
     builder: "ios-device-goma-rbe-latest-clobber"
   >
 >
+job: <
+  id: "ios-device-xcode-clang"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-device-xcode-clang"
+  >
+>
 job: <
   id: "ios-simulator-code-coverage"
   acl_sets: "ci"
@@ -5420,6 +5429,15 @@ job: <
     builder: "ios-simulator-noncq"
   >
 >
+job: <
+  id: "ios-simulator-xcode-clang"
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ios-simulator-xcode-clang"
+  >
+>
 job: <
   id: "ios-webkit-tot"
   schedule: "0 1-23/6 * * *"
@@ -6430,12 +6448,14 @@ trigger: <
   triggers: "fuchsia-x64-cast"
   triggers: "fuchsia-x64-dbg"
   triggers: "ios-device"
+  triggers: "ios-device-xcode-clang"
   triggers: "ci-ios-simulator"
   triggers: "ios-simulator-code-coverage"
   triggers: "ios-simulator-cr-recipe"
   triggers: "ios-simulator-cronet"
   triggers: "ios-simulator-full-configs"
   triggers: "ios-simulator-noncq"
+  triggers: "ios-simulator-xcode-clang"
   triggers: "ios13-beta-simulator"
   triggers: "ios13-sdk-device"
   triggers: "ios13-sdk-simulator"

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

+{
+  "comments": [
+    "Builder for devices.",
+    "Build is performed with gn+ninja."
+  ],
+  "xcode build version": "11c29",
+  "gn_args": [
+    "goma_dir=\"$(goma_dir)\"",
+    "ios_enable_code_signing=false",
+    "is_component_build=false",
+    "is_debug=false",
+    "symbol_level=0",
+    "target_cpu=\"arm64\"",
+    "target_os=\"ios\"",
+    "use_goma=false",
+    "use_xcode_clang=true"
+  ],
+  "additional_compile_targets": [
+    "all"
+  ],
+  "configuration": "Release",
+  "tests": [
+  ]
+}

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

+{
+  "comments": [
+    "Compiles Xcode Clang/Xcode11.",
+    "This 'xcode build version' must exist in GOMA",
+    "Build is performed with gn+ninja."
+  ],
+  "xcode build version": "11c29",
+  "use xcode build version": true,
+  "gn_args": [
+    "goma_dir=\"$(goma_dir)\"",
+    "ios_enable_code_signing=false",
+    "is_component_build=false",
+    "is_debug=true",
+    "symbol_level=0",
+    "target_cpu=\"x64\"",
+    "target_os=\"ios\"",
+    "use_goma=false",
+    "use_xcode_clang=true"
+  ],
+  "env": {
+    "FORCE_MAC_TOOLCHAIN": ""
+  },
+  "additional_compile_targets": [
+    "all"
+  ],
+  "configuration": "Debug",
+  "tests": [
+  ]
+}

tools/mb/mb_config.pyl

@@ -474,9 +474,11 @@
       'Mac Builder': 'gpu_tests_release_bot_minimal_symbols',
       'Mac Builder (dbg)': 'gpu_tests_debug_bot',
       'ios-device': 'ios_error',
+      'ios-device-xcode-clang': 'ios_error',
       'ios-simulator': 'ios_error',
       'ios-simulator-cronet': 'ios_error',
       'ios-simulator-full-configs': 'ios_error',
+      'ios-simulator-xcode-clang': 'ios_error',
       'WebKit Mac10.13 (retina)': 'release_bot',
     },
 
@@ -883,10 +885,12 @@
       'gpu-try-mac-amd-retina-dbg': 'gpu_tests_debug_bot',
       'gpu-try-mac-intel-dbg': 'gpu_tests_debug_bot',
       'ios-device': 'ios_error',
+      'ios-device-xcode-clang': 'ios_error',
       'ios-simulator': 'ios_error',
       'ios-simulator-full-configs': 'ios_error',
       'ios-simulator-cronet': 'ios_error',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot',
+      'ios-simulator-xcode-clang': 'ios_error',
       'mac-osxbeta-rel': 'gpu_tests_release_trybot_deterministic_mac',
       'mac_chromium_10.10': 'gpu_tests_release_trybot_deterministic_mac',
       'mac_chromium_10.12_rel_ng': 'gpu_tests_release_trybot_deterministic_mac',

tools/mb/mb_config_buckets.pyl

@@ -218,11 +218,13 @@
       'fuchsia-x64-cast': 'release_trybot_fuchsia_cast',
       'fuchsia-x64-dbg': 'debug_bot_fuchsia_compile_only',
       'ios-device': 'ios_error',
+      'ios-device-xcode-clang': 'ios_error',
       'ios-simulator': 'ios_error',
       'ios-simulator-code-coverage': 'clang_code_coverage_ios',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot',
       'ios-simulator-cronet': 'ios_error',
       'ios-simulator-full-configs': 'ios_error',
+      'ios-simulator-xcode-clang': 'ios_error',
       'linux-annotator-rel': 'release_trybot',
       'linux-archive-dbg': 'debug_bot',
       'linux-archive-rel': 'release_bot',
@@ -786,10 +788,12 @@
       'gpu-try-mac-amd-retina-dbg': 'gpu_tests_debug_bot',
       'gpu-try-mac-intel-dbg': 'gpu_tests_debug_bot',
       'ios-device': 'ios_error',
+      'ios-device-xcode-clang': 'ios_error',
       'ios-simulator': 'ios_error',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot',
       'ios-simulator-cronet': 'ios_error',
       'ios-simulator-full-configs': 'ios_error',
+      'ios-simulator-xcode-clang': 'ios_error',
       'layout_test_leak_detection': 'release_trybot',
       'leak_detection_linux': 'release_trybot',
       'linux-angle-rel': 'gpu_fyi_tests_release_trybot',
@@ -1128,10 +1132,12 @@
       'gpu-try-mac-amd-retina-dbg': 'gpu_tests_debug_bot',
       'gpu-try-mac-intel-dbg': 'gpu_tests_debug_bot',
       'ios-device': 'ios_error',
+      'ios-device-xcode-clang': 'ios_error',
       'ios-simulator': 'ios_error',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot',
       'ios-simulator-cronet': 'ios_error',
       'ios-simulator-full-configs': 'ios_error',
+      'ios-simulator-xcode-clang': 'ios_error',
       'layout_test_leak_detection': 'release_trybot',
       'leak_detection_linux': 'release_trybot',
       'linux-angle-rel': 'gpu_fyi_tests_release_trybot',
@@ -1382,10 +1388,12 @@
       'gpu-try-mac-amd-retina-dbg': 'gpu_tests_debug_bot',
       'gpu-try-mac-intel-dbg': 'gpu_tests_debug_bot',
       'ios-device': 'ios_error',
+      'ios-device-xcode-clang': 'ios_error',
       'ios-simulator': 'ios_error',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot',
       'ios-simulator-cronet': 'ios_error',
       'ios-simulator-full-configs': 'ios_error',
+      'ios-simulator-xcode-clang': 'ios_error',
       'layout_test_leak_detection': 'release_trybot',
       'leak_detection_linux': 'release_trybot',
       'linux-angle-rel': 'gpu_fyi_tests_release_trybot',