Reland "[iOS] Remove xcode clang bots"

This reverts commit d1ad8ab. Reason for revert: failures were just the death throes of a dying bot. Original change's description: > Revert "[iOS] Remove xcode clang bots" > > This reverts commit 3893c26. > > 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 <[email protected]> > > Reviewed-by: Stephen Martinis <[email protected]> > > Commit-Queue: Mike Dougherty <[email protected]> > > Cr-Commit-Position: refs/heads/master@{#741519} > > [email protected],[email protected],[email protected] > > 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/+/2057583 > Reviewed-by: Chris Mumford <[email protected]> > Commit-Queue: Chris Mumford <[email protected]> > Cr-Commit-Position: refs/heads/master@{#741528} [email protected],[email protected],[email protected],[email protected] Change-Id: I5d2e02e4f3cd2b16c727fbd2f123b50e4e31dfe4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1049646 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2056755 Reviewed-by: John Budorick <[email protected]> Commit-Queue: John Budorick <[email protected]> Cr-Commit-Position: refs/heads/master@{#741562}
scheib · Feb 14, 2020 · 1969858 · 1969858
1 parent 955059f
commit 1969858
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 302 deletions.
diff --git a/docs/ios/infra.md b/docs/ios/infra.md
@@ -83,25 +83,21 @@ 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`, `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).
+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).
 
-`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-device` compiles for the iOS device architecture (ARM) and runs no tests.
+A build is considered successful so long as compilation is successful.
 
-`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-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-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

diff --git a/infra/config/buckets/ci.star b/infra/config/buckets/ci.star
@@ -1702,10 +1702,6 @@ 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',
 )
@@ -1714,10 +1710,6 @@ ci.mac_ios_builder(
     name = 'ios-simulator-noncq',
 )
 
-ci.mac_ios_builder(
-    name = 'ios-simulator-xcode-clang',
-)
-
 
 ci.memory_builder(
     name = 'Android CFI',

diff --git a/infra/config/buckets/try.star b/infra/config/buckets/try.star
@@ -816,10 +816,6 @@ 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',
@@ -859,10 +855,6 @@ try_.chromium_mac_ios_builder(
     ),
 )
 
-try_.chromium_mac_ios_builder(
-    name = 'ios-simulator-xcode-clang',
-)
-
 try_.chromium_mac_ios_builder(
     name = 'ios13-beta-simulator',
 )

diff --git a/infra/config/consoles/chromium.mac.star b/infra/config/consoles/chromium.mac.star
@@ -63,15 +63,5 @@ 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',
-        ),
     ],
 )
diff --git a/infra/config/consoles/luci.chromium.try.star b/infra/config/consoles/luci.chromium.try.star
@@ -138,11 +138,9 @@ 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',

diff --git a/infra/config/consoles/main.star b/infra/config/consoles/main.star
@@ -174,16 +174,6 @@ 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',

diff --git a/infra/config/consoles/sheriff.ios.star b/infra/config/consoles/sheriff.ios.star
@@ -25,16 +25,6 @@ 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',

diff --git a/infra/config/consoles/tryserver.chromium.mac.star b/infra/config/consoles/tryserver.chromium.mac.star
@@ -17,12 +17,10 @@ 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',

diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
@@ -655,10 +655,6 @@ 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"
       >
@@ -685,10 +681,6 @@ 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

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
@@ -6772,28 +6772,6 @@ 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"
@@ -6931,28 +6909,6 @@ 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"
@@ -15617,36 +15573,6 @@ 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"
@@ -15829,36 +15755,6 @@ 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"

diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
@@ -7519,16 +7519,6 @@ 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"
@@ -10637,9 +10627,6 @@ 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"
   >
@@ -10649,9 +10636,6 @@ 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"
   >
@@ -10947,16 +10931,6 @@ 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"
@@ -12438,16 +12412,6 @@ 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"
@@ -13328,9 +13292,6 @@ 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"
   >
@@ -13343,9 +13304,6 @@ 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"
   >