infra: Update most bots' xcode cache location to 11c29.

Most bots' xcode were upgraded to 11c29 in crrev.com/c/2028249.
However, we tell swarming to persist only the xcode located in
11a1027, so the new xcode located in 11c29 isn't getting persisted.
Consequently every build does a fresh download of xcode, which
leads to a 20+ min download time:
https://luci-milo.appspot.com/p/chromium/builders/try/ios-simulator/473405

This should fix that.

Bug: 1048301, 1041618
Change-Id: Ie610497b6c40edb66021fa7fe55676cbf96fb8f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036443
Auto-Submit: Ben Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738009}

infra/config/buckets/ci.star

@@ -1071,7 +1071,7 @@ ci.fyi_coverage_builder(
 
 ci.fyi_coverage_builder(
     name = 'ios-simulator-code-coverage',
-    caches = [xcode_cache.x11a1027],
+    caches = [xcode_cache.x11m382q],
     cores = None,
     goma_backend = None,  # TODO(crbug.com/950413): Use goma.backend.RBE_PROD
     os = os.MAC_ANY,

infra/config/buckets/goma.star

@@ -117,7 +117,7 @@ fyi_goma_canary_builder(
 
 fyi_goma_canary_builder(
     name = 'ios-device-goma-canary-clobber',
-    caches = [xcode_cache.x11a1027],
+    caches = [xcode_cache.x11c29],
     cores = None,
     executable = 'recipe:ios/unified_builder_tester',
     os = os.MAC_ANY,
@@ -191,7 +191,7 @@ fyi_goma_rbe_canary_builder(
 
 fyi_goma_rbe_canary_builder(
     name = 'ios-device-goma-rbe-canary-clobber',
-    caches = [xcode_cache.x11a1027],
+    caches = [xcode_cache.x11c29],
     cores = None,
     executable = 'recipe:ios/unified_builder_tester',
     os = os.MAC_ANY,
@@ -285,7 +285,7 @@ fyi_goma_latest_client_builder(
 
 fyi_goma_latest_client_builder(
     name = 'ios-device-goma-latest-clobber',
-    caches = [xcode_cache.x11a1027],
+    caches = [xcode_cache.x11c29],
     cores = None,
     executable = 'recipe:ios/unified_builder_tester',
     os = os.MAC_ANY,
@@ -373,7 +373,7 @@ fyi_goma_rbe_latest_client_builder(
 
 fyi_goma_rbe_latest_client_builder(
     name = 'ios-device-goma-rbe-latest-clobber',
-    caches = [xcode_cache.x11a1027],
+    caches = [xcode_cache.x11c29],
     cores = None,
     executable = 'recipe:ios/unified_builder_tester',
     os = os.MAC_ANY,

infra/config/buckets/webrtc.fyi.star

@@ -149,14 +149,14 @@ builder(
 
 builder(
     name = 'WebRTC Chromium FYI ios-device',
-    caches = [xcode_cache.x11a1027],
+    caches = [xcode_cache.x11c29],
     executable = 'recipe:webrtc/chromium_ios',
     os = os.MAC_ANY,
 )
 
 builder(
     name = 'WebRTC Chromium FYI ios-simulator',
-    caches = [xcode_cache.x11a1027],
+    caches = [xcode_cache.x11c29],
     executable = 'recipe:webrtc/chromium_ios',
     os = os.MAC_ANY,
 )

infra/config/generated/cr-buildbucket.cfg

@@ -6743,8 +6743,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6765,8 +6765,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6788,8 +6788,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6813,8 +6813,8 @@ buckets: <
       >
       execution_timeout_secs: 72000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11m382q"
+        path: "xcode_ios_11m382q.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6836,8 +6836,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6858,8 +6858,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6880,8 +6880,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6902,8 +6902,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6924,8 +6924,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6946,8 +6946,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6968,8 +6968,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -6990,8 +6990,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -7012,8 +7012,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -9134,8 +9134,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -9775,8 +9775,8 @@ buckets: <
       >
       execution_timeout_secs: 10800
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -11360,8 +11360,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -11383,8 +11383,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -11407,8 +11407,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -11431,8 +11431,8 @@ buckets: <
       >
       execution_timeout_secs: 36000
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15550,8 +15550,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15580,8 +15580,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15611,8 +15611,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15642,8 +15642,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15672,8 +15672,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15702,8 +15702,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15732,8 +15732,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15762,8 +15762,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15792,8 +15792,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15822,8 +15822,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -15852,8 +15852,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -19500,8 +19500,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -20099,8 +20099,8 @@ buckets: <
         path: "win_toolchain"
       >
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -20763,8 +20763,8 @@ buckets: <
       >
       execution_timeout_secs: 7200
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -20784,8 +20784,8 @@ buckets: <
       >
       execution_timeout_secs: 7200
       caches: <
-        name: "xcode_ios_11a1027"
-        path: "xcode_ios_11a1027.app"
+        name: "xcode_ios_11c29"
+        path: "xcode_ios_11c29.app"
       >
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"

infra/config/lib/builders.star

@@ -129,6 +129,7 @@ xcode_cache = struct(
    x10e1001 = xcode_enum('xcode_ios_10e1001', 'xcode_ios_10e1001.app'),
    x11a1027 = xcode_enum('xcode_ios_11a1027', 'xcode_ios_11a1027.app'),
    x11c29 = xcode_enum('xcode_ios_11c29', 'xcode_ios_11c29.app'),
+   x11m382q = xcode_enum('xcode_ios_11m382q', 'xcode_ios_11m382q.app'),
 )
 
 

infra/config/lib/ci.star

@@ -202,7 +202,7 @@ def fyi_ios_builder(
     **kwargs):
   return fyi_builder(
       name = name,
-      caches = [builders.xcode_cache.x11a1027],
+      caches = [builders.xcode_cache.x11c29],
       cores = None,
       executable = executable,
       goma_backend = None,
@@ -356,7 +356,7 @@ def mac_builder(
 def mac_ios_builder(*, name, **kwargs):
   return mac_builder(
       name = name,
-      caches = [builders.xcode_cache.x11a1027],
+      caches = [builders.xcode_cache.x11c29],
       executable = 'recipe:ios/unified_builder_tester',
       goma_backend = None,
       os = builders.os.MAC_ANY,

infra/config/lib/try.star

@@ -180,7 +180,7 @@ def chromium_mac_builder(
 def chromium_mac_ios_builder(*, name, executable='recipe:ios/try', **kwargs):
   return try_builder(
       name = name,
-      caches = [builders.xcode_cache.x11a1027],
+      caches = [builders.xcode_cache.x11c29],
       cores = None,
       executable = executable,
       mastername = 'tryserver.chromium.mac',