Commit 404a5151 authored by Jeff Yoon's avatar Jeff Yoon Committed by Commit Bot

[ios] roll to xcode 12 gm seed (12a7209)

* Roll all iOS builders (goma, webrtc, fyi, mac, try) to 12a7209
* Roll all upstream iOS tests to run on 12a7209

Bug: 1128632
Change-Id: Ia18f2391e9aea21c92d867612bc43a140ef96fc7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2411403
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808480}
parent cd8e141f
This diff is collapsed.
...@@ -135,8 +135,8 @@ xcode_cache = struct( ...@@ -135,8 +135,8 @@ xcode_cache = struct(
x11e146 = xcode_enum("xcode_ios_11e146", "xcode_ios_11e146.app"), x11e146 = xcode_enum("xcode_ios_11e146", "xcode_ios_11e146.app"),
# in use by ios-webkit-tot # in use by ios-webkit-tot
x11e608cwk = xcode_enum("xcode_ios_11e608cwk", "xcode_ios_11e608cwk.app"), x11e608cwk = xcode_enum("xcode_ios_11e608cwk", "xcode_ios_11e608cwk.app"),
# xc12 beta 6 # (current default) xc12 gm seed
x12a8189n = xcode_enum("xcode_ios_12a8189n", "xcode_ios_12a8189n.app"), x12a7209 = xcode_enum("xcode_ios_12a7209", "xcode_ios_12a7209.app"),
) )
################################################################################ ################################################################################
......
...@@ -689,10 +689,10 @@ def fyi_ios_builder( ...@@ -689,10 +689,10 @@ def fyi_ios_builder(
properties = None, properties = None,
**kwargs): **kwargs):
# Default cache and properties sync # Default cache and properties sync
caches = caches or [builders.xcode_cache.x12a8189n] caches = caches or [builders.xcode_cache.x12a7209]
properties = properties or {} properties = properties or {}
properties.setdefault("xcode_build_version", "12a8189n") properties.setdefault("xcode_build_version", "12a7209")
return fyi_builder( return fyi_builder(
name = name, name = name,
...@@ -864,10 +864,10 @@ def mac_ios_builder( ...@@ -864,10 +864,10 @@ def mac_ios_builder(
goma_backend = builders.goma.backend.RBE_PROD, goma_backend = builders.goma.backend.RBE_PROD,
properties = None, properties = None,
**kwargs): **kwargs):
caches = caches or [builders.xcode_cache.x12a8189n] caches = caches or [builders.xcode_cache.x12a7209]
properties = properties or {} properties = properties or {}
properties.setdefault("xcode_build_version", "12a8189n") properties.setdefault("xcode_build_version", "12a7209")
return mac_builder( return mac_builder(
name = name, name = name,
......
...@@ -411,10 +411,10 @@ def chromium_mac_ios_builder( ...@@ -411,10 +411,10 @@ def chromium_mac_ios_builder(
os = builders.os.MAC_10_15, os = builders.os.MAC_10_15,
properties = None, properties = None,
**kwargs): **kwargs):
caches = caches or [builders.xcode_cache.x12a8189n] caches = caches or [builders.xcode_cache.x12a7209]
properties = properties or {} properties = properties or {}
properties.setdefault("xcode_build_version", "12a8189n") properties.setdefault("xcode_build_version", "12a7209")
return try_builder( return try_builder(
name = name, name = name,
......
...@@ -1489,7 +1489,7 @@ ci.clang_builder( ...@@ -1489,7 +1489,7 @@ ci.clang_builder(
ci.clang_builder( ci.clang_builder(
name = "ToTiOS", name = "ToTiOS",
builderless = False, builderless = False,
caches = [xcode_cache.x12a8189n], caches = [xcode_cache.x12a7209],
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "iOS|public", category = "iOS|public",
short_name = "sim", short_name = "sim",
...@@ -1497,7 +1497,7 @@ ci.clang_builder( ...@@ -1497,7 +1497,7 @@ ci.clang_builder(
cores = None, cores = None,
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
ssd = True, ssd = True,
) )
...@@ -1505,7 +1505,7 @@ ci.clang_builder( ...@@ -1505,7 +1505,7 @@ ci.clang_builder(
ci.clang_builder( ci.clang_builder(
name = "ToTiOSDevice", name = "ToTiOSDevice",
builderless = False, builderless = False,
caches = [xcode_cache.x12a8189n], caches = [xcode_cache.x12a7209],
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "iOS|public", category = "iOS|public",
short_name = "dev", short_name = "dev",
...@@ -1513,7 +1513,7 @@ ci.clang_builder( ...@@ -1513,7 +1513,7 @@ ci.clang_builder(
cores = None, cores = None,
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
ssd = True, ssd = True,
) )
...@@ -2726,7 +2726,7 @@ ci.fyi_coverage_builder( ...@@ -2726,7 +2726,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.x12a8189n], caches = [xcode_cache.x12a7209],
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
category = "code_coverage", category = "code_coverage",
short_name = "ios", short_name = "ios",
...@@ -2737,7 +2737,7 @@ ci.fyi_coverage_builder( ...@@ -2737,7 +2737,7 @@ ci.fyi_coverage_builder(
coverage_exclude_sources = "ios_test_files_and_test_utils", coverage_exclude_sources = "ios_test_files_and_test_utils",
coverage_test_types = ["overall", "unit"], coverage_test_types = ["overall", "unit"],
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
......
...@@ -1206,43 +1206,32 @@ try_.chromium_mac_builder( ...@@ -1206,43 +1206,32 @@ try_.chromium_mac_builder(
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = "ios-device", name = "ios-device",
executable = "recipe:chromium_trybot",
) )
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = "ios-simulator", name = "ios-simulator",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
executable = "recipe:chromium_trybot",
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
properties = {
"xcode_build_version": "12a8189n",
},
tryjob = try_.job(), tryjob = try_.job(),
) )
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = "ios-simulator-code-coverage", name = "ios-simulator-code-coverage",
executable = "recipe:chromium_trybot",
use_clang_coverage = True, use_clang_coverage = True,
coverage_exclude_sources = "ios_test_files_and_test_utils", coverage_exclude_sources = "ios_test_files_and_test_utils",
coverage_test_types = ["unit"], coverage_test_types = ["unit"],
os = os.MAC_10_15, os = os.MAC_10_15,
properties = {
"xcode_build_version": "12a8189n",
},
tryjob = try_.job(experiment_percentage = 3), tryjob = try_.job(experiment_percentage = 3),
) )
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = "ios-simulator-cr-recipe", name = "ios-simulator-cr-recipe",
executable = "recipe:chromium_trybot",
) )
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = "ios-simulator-cronet", name = "ios-simulator-cronet",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
caches = [xcode_cache.x11e146], caches = [xcode_cache.x11e146],
executable = "recipe:chromium_trybot",
main_list_view = settings.main_list_view_name, main_list_view = settings.main_list_view_name,
properties = { properties = {
"xcode_build_version": "11e146", "xcode_build_version": "11e146",
......
...@@ -111,11 +111,11 @@ fyi_goma_canary_builder( ...@@ -111,11 +111,11 @@ 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.x12a8189n], caches = [xcode_cache.x12a7209],
cores = None, cores = None,
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
...@@ -187,11 +187,11 @@ fyi_goma_rbe_canary_builder( ...@@ -187,11 +187,11 @@ 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.x12a8189n], caches = [xcode_cache.x12a7209],
cores = None, cores = None,
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
...@@ -273,11 +273,11 @@ fyi_goma_latest_client_builder( ...@@ -273,11 +273,11 @@ 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.x12a8189n], caches = [xcode_cache.x12a7209],
cores = None, cores = None,
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
...@@ -363,11 +363,11 @@ fyi_goma_rbe_latest_client_builder( ...@@ -363,11 +363,11 @@ 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.x12a8189n], caches = [xcode_cache.x12a7209],
cores = None, cores = None,
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
...@@ -482,11 +482,11 @@ def goma_mac_builder( ...@@ -482,11 +482,11 @@ def goma_mac_builder(
goma_mac_builder( goma_mac_builder(
name = "Chromium iOS Goma RBE ToT", name = "Chromium iOS Goma RBE ToT",
caches = [xcode_cache.x12a8189n], caches = [xcode_cache.x12a7209],
goma_backend = goma.backend.RBE_TOT, goma_backend = goma.backend.RBE_TOT,
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
......
...@@ -151,22 +151,22 @@ builder( ...@@ -151,22 +151,22 @@ builder(
builder( builder(
name = "WebRTC Chromium FYI ios-device", name = "WebRTC Chromium FYI ios-device",
caches = [xcode_cache.x12a8189n], caches = [xcode_cache.x12a7209],
executable = "recipe:webrtc/chromium_ios", executable = "recipe:webrtc/chromium_ios",
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY, os = os.MAC_ANY,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
builder( builder(
name = "WebRTC Chromium FYI ios-simulator", name = "WebRTC Chromium FYI ios-simulator",
caches = [xcode_cache.x12a8189n], caches = [xcode_cache.x12a7209],
executable = "recipe:webrtc/chromium_ios", executable = "recipe:webrtc/chromium_ios",
goma_backend = goma.backend.RBE_PROD, goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY, os = os.MAC_ANY,
properties = { properties = {
"xcode_build_version": "12a8189n", "xcode_build_version": "12a7209",
}, },
) )
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -931,6 +931,7 @@ ...@@ -931,6 +931,7 @@
}, },
}, },
}, },
# in use by ios-simulator-cronet
'xcode_11e146': { 'xcode_11e146': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
...@@ -947,6 +948,7 @@ ...@@ -947,6 +948,7 @@
], ],
}, },
}, },
# in use by ios-webkit-tot
'xcode_11e608c': { 'xcode_11e608c': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
...@@ -963,18 +965,18 @@ ...@@ -963,18 +965,18 @@
], ],
}, },
}, },
# xcode 12 beta 6 # (default) xcode 12 gm seed
'xcode_12a8189n': { 'xcode_12a7209': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
'--xcode-build-version', '--xcode-build-version',
'12a8189n' '12a7209'
], ],
}, },
'swarming': { 'swarming': {
'named_caches': [ 'named_caches': [
{ {
'name': 'xcode_ios_12a8189n', 'name': 'xcode_ios_12a7209',
'path': 'Xcode.app', 'path': 'Xcode.app',
}, },
], ],
......
...@@ -1389,7 +1389,7 @@ ...@@ -1389,7 +1389,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n', 'xcode_12a7209',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_clang_tot_sim_tests' 'isolated_scripts': 'ios_clang_tot_sim_tests'
...@@ -1419,7 +1419,7 @@ ...@@ -1419,7 +1419,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n', 'xcode_12a7209',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_clang_tot_device_tests' 'isolated_scripts': 'ios_clang_tot_device_tests'
...@@ -2101,7 +2101,7 @@ ...@@ -2101,7 +2101,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n' 'xcode_12a7209'
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_asan_tests', 'isolated_scripts': 'ios_asan_tests',
...@@ -2114,7 +2114,7 @@ ...@@ -2114,7 +2114,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n' 'xcode_12a7209'
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_code_coverage_tests', 'isolated_scripts': 'ios_code_coverage_tests',
...@@ -2136,7 +2136,7 @@ ...@@ -2136,7 +2136,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n' 'xcode_12a7209'
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_simulator_multi_window_tests', 'isolated_scripts': 'ios_simulator_multi_window_tests',
...@@ -2179,7 +2179,7 @@ ...@@ -2179,7 +2179,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n', 'xcode_12a7209',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios14_beta_simulator_tests' 'isolated_scripts': 'ios14_beta_simulator_tests'
...@@ -2195,7 +2195,7 @@ ...@@ -2195,7 +2195,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n', 'xcode_12a7209',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios14_sdk_simulator_tests' 'isolated_scripts': 'ios14_sdk_simulator_tests'
...@@ -4570,7 +4570,7 @@ ...@@ -4570,7 +4570,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n', 'xcode_12a7209',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_simulator_tests', 'isolated_scripts': 'ios_simulator_tests',
...@@ -4584,7 +4584,7 @@ ...@@ -4584,7 +4584,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n', 'xcode_12a7209',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_simulator_full_configs_test' 'isolated_scripts': 'ios_simulator_full_configs_test'
...@@ -4598,7 +4598,7 @@ ...@@ -4598,7 +4598,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8189n', 'xcode_12a7209',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios_simulator_noncq_tests' 'isolated_scripts': 'ios_simulator_noncq_tests'
......
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