Commit 6167a158 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

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: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738009}
parent 1fd12b2d
...@@ -1071,7 +1071,7 @@ ci.fyi_coverage_builder( ...@@ -1071,7 +1071,7 @@ ci.fyi_coverage_builder(
ci.fyi_coverage_builder( ci.fyi_coverage_builder(
name = 'ios-simulator-code-coverage', name = 'ios-simulator-code-coverage',
caches = [xcode_cache.x11a1027], caches = [xcode_cache.x11m382q],
cores = None, cores = None,
goma_backend = None, # TODO(crbug.com/950413): Use goma.backend.RBE_PROD goma_backend = None, # TODO(crbug.com/950413): Use goma.backend.RBE_PROD
os = os.MAC_ANY, os = os.MAC_ANY,
......
...@@ -117,7 +117,7 @@ fyi_goma_canary_builder( ...@@ -117,7 +117,7 @@ fyi_goma_canary_builder(
fyi_goma_canary_builder( fyi_goma_canary_builder(
name = 'ios-device-goma-canary-clobber', name = 'ios-device-goma-canary-clobber',
caches = [xcode_cache.x11a1027], caches = [xcode_cache.x11c29],
cores = None, cores = None,
executable = 'recipe:ios/unified_builder_tester', executable = 'recipe:ios/unified_builder_tester',
os = os.MAC_ANY, os = os.MAC_ANY,
...@@ -191,7 +191,7 @@ fyi_goma_rbe_canary_builder( ...@@ -191,7 +191,7 @@ fyi_goma_rbe_canary_builder(
fyi_goma_rbe_canary_builder( fyi_goma_rbe_canary_builder(
name = 'ios-device-goma-rbe-canary-clobber', name = 'ios-device-goma-rbe-canary-clobber',
caches = [xcode_cache.x11a1027], caches = [xcode_cache.x11c29],
cores = None, cores = None,
executable = 'recipe:ios/unified_builder_tester', executable = 'recipe:ios/unified_builder_tester',
os = os.MAC_ANY, os = os.MAC_ANY,
...@@ -285,7 +285,7 @@ fyi_goma_latest_client_builder( ...@@ -285,7 +285,7 @@ fyi_goma_latest_client_builder(
fyi_goma_latest_client_builder( fyi_goma_latest_client_builder(
name = 'ios-device-goma-latest-clobber', name = 'ios-device-goma-latest-clobber',
caches = [xcode_cache.x11a1027], caches = [xcode_cache.x11c29],
cores = None, cores = None,
executable = 'recipe:ios/unified_builder_tester', executable = 'recipe:ios/unified_builder_tester',
os = os.MAC_ANY, os = os.MAC_ANY,
...@@ -373,7 +373,7 @@ fyi_goma_rbe_latest_client_builder( ...@@ -373,7 +373,7 @@ fyi_goma_rbe_latest_client_builder(
fyi_goma_rbe_latest_client_builder( fyi_goma_rbe_latest_client_builder(
name = 'ios-device-goma-rbe-latest-clobber', name = 'ios-device-goma-rbe-latest-clobber',
caches = [xcode_cache.x11a1027], caches = [xcode_cache.x11c29],
cores = None, cores = None,
executable = 'recipe:ios/unified_builder_tester', executable = 'recipe:ios/unified_builder_tester',
os = os.MAC_ANY, os = os.MAC_ANY,
......
...@@ -149,14 +149,14 @@ builder( ...@@ -149,14 +149,14 @@ builder(
builder( builder(
name = 'WebRTC Chromium FYI ios-device', name = 'WebRTC Chromium FYI ios-device',
caches = [xcode_cache.x11a1027], caches = [xcode_cache.x11c29],
executable = 'recipe:webrtc/chromium_ios', executable = 'recipe:webrtc/chromium_ios',
os = os.MAC_ANY, os = os.MAC_ANY,
) )
builder( builder(
name = 'WebRTC Chromium FYI ios-simulator', name = 'WebRTC Chromium FYI ios-simulator',
caches = [xcode_cache.x11a1027], caches = [xcode_cache.x11c29],
executable = 'recipe:webrtc/chromium_ios', executable = 'recipe:webrtc/chromium_ios',
os = os.MAC_ANY, os = os.MAC_ANY,
) )
This diff is collapsed.
...@@ -129,6 +129,7 @@ xcode_cache = struct( ...@@ -129,6 +129,7 @@ xcode_cache = struct(
x10e1001 = xcode_enum('xcode_ios_10e1001', 'xcode_ios_10e1001.app'), x10e1001 = xcode_enum('xcode_ios_10e1001', 'xcode_ios_10e1001.app'),
x11a1027 = xcode_enum('xcode_ios_11a1027', 'xcode_ios_11a1027.app'), x11a1027 = xcode_enum('xcode_ios_11a1027', 'xcode_ios_11a1027.app'),
x11c29 = xcode_enum('xcode_ios_11c29', 'xcode_ios_11c29.app'), x11c29 = xcode_enum('xcode_ios_11c29', 'xcode_ios_11c29.app'),
x11m382q = xcode_enum('xcode_ios_11m382q', 'xcode_ios_11m382q.app'),
) )
......
...@@ -202,7 +202,7 @@ def fyi_ios_builder( ...@@ -202,7 +202,7 @@ def fyi_ios_builder(
**kwargs): **kwargs):
return fyi_builder( return fyi_builder(
name = name, name = name,
caches = [builders.xcode_cache.x11a1027], caches = [builders.xcode_cache.x11c29],
cores = None, cores = None,
executable = executable, executable = executable,
goma_backend = None, goma_backend = None,
...@@ -356,7 +356,7 @@ def mac_builder( ...@@ -356,7 +356,7 @@ def mac_builder(
def mac_ios_builder(*, name, **kwargs): def mac_ios_builder(*, name, **kwargs):
return mac_builder( return mac_builder(
name = name, name = name,
caches = [builders.xcode_cache.x11a1027], caches = [builders.xcode_cache.x11c29],
executable = 'recipe:ios/unified_builder_tester', executable = 'recipe:ios/unified_builder_tester',
goma_backend = None, goma_backend = None,
os = builders.os.MAC_ANY, os = builders.os.MAC_ANY,
......
...@@ -180,7 +180,7 @@ def chromium_mac_builder( ...@@ -180,7 +180,7 @@ def chromium_mac_builder(
def chromium_mac_ios_builder(*, name, executable='recipe:ios/try', **kwargs): def chromium_mac_ios_builder(*, name, executable='recipe:ios/try', **kwargs):
return try_builder( return try_builder(
name = name, name = name,
caches = [builders.xcode_cache.x11a1027], caches = [builders.xcode_cache.x11c29],
cores = None, cores = None,
executable = executable, executable = executable,
mastername = 'tryserver.chromium.mac', mastername = 'tryserver.chromium.mac',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment