Skip to content

GitLab

T
tangled
Commit ac43d2e7 authored by Lindsay Pasricha's avatar Lindsay Pasricha Committed by Commit Bot
Browse files
Options

[ios]Roll to xcode11.5 11e608c upstream fyi 

Also updated ios fyi bot def to os=mac 10.15.

Bug: 1087433
Change-Id: I348d9b8d9bb637a2c79bb58086cfe6ea8206005a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2240459
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779544}
parent 094fd64a
Hide whitespace changes
Inline Side-by-side
Showing with 1652 additions and 1615 deletions
infra/config/generated/cr-buildbucket.cfg
View file @ ac43d2e7
...@@ -10565,12 +10565,12 @@ buckets { ...@@ -10565,12 +10565,12 @@ buckets {
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.fyi\"" properties_j: "mastername:\"chromium.fyi\""
properties_j: "xcode_build_version:\"11e146\"" properties_j: "xcode_build_version:\"11e608c\""
} }
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_11e608c"
path: "xcode_ios_11e146.app" path: "xcode_ios_11e608c.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -10599,12 +10599,12 @@ buckets { ...@@ -10599,12 +10599,12 @@ buckets {
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"chromium.fyi\"" properties_j: "mastername:\"chromium.fyi\""
properties_j: "xcode_build_version:\"11e146\"" properties_j: "xcode_build_version:\"11e608c\""
} }
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_11e608c"
path: "xcode_ios_11e146.app" path: "xcode_ios_11e608c.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -25216,7 +25216,7 @@ buckets { ...@@ -25216,7 +25216,7 @@ buckets {
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"tryserver.chromium.mac\"" properties_j: "mastername:\"tryserver.chromium.mac\""
properties_j: "xcode_build_version:\"11e146\"" properties_j: "xcode_build_version:\"11e608c\""
} }
execution_timeout_secs: 14400 execution_timeout_secs: 14400
expiration_secs: 7200 expiration_secs: 7200
...@@ -25225,8 +25225,8 @@ buckets { ...@@ -25225,8 +25225,8 @@ buckets {
path: "win_toolchain" path: "win_toolchain"
} }
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_11e608c"
path: "xcode_ios_11e146.app" path: "xcode_ios_11e608c.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -25258,7 +25258,7 @@ buckets { ...@@ -25258,7 +25258,7 @@ buckets {
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}"
properties_j: "mastername:\"tryserver.chromium.mac\"" properties_j: "mastername:\"tryserver.chromium.mac\""
properties_j: "xcode_build_version:\"11e146\"" properties_j: "xcode_build_version:\"11e608c\""
} }
execution_timeout_secs: 14400 execution_timeout_secs: 14400
expiration_secs: 7200 expiration_secs: 7200
...@@ -25267,8 +25267,8 @@ buckets { ...@@ -25267,8 +25267,8 @@ buckets {
path: "win_toolchain" path: "win_toolchain"
} }
caches { caches {
name: "xcode_ios_11e146" name: "xcode_ios_11e608c"
path: "xcode_ios_11e146.app" path: "xcode_ios_11e608c.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
infra/config/subprojects/chromium/master-only/ci.star
View file @ ac43d2e7
...@@ -1728,6 +1728,7 @@ ci.fyi_ios_builder( ...@@ -1728,6 +1728,7 @@ ci.fyi_ios_builder(
short_name = 'mwd', short_name = 'mwd',
), ),
executable = 'recipe:chromium', executable = 'recipe:chromium',
os = os.MAC_10_15,
properties = { properties = {
'xcode_build_version': '11e146', 'xcode_build_version': '11e146',
}, },
...@@ -1755,6 +1756,7 @@ ci.fyi_ios_builder( ...@@ -1755,6 +1756,7 @@ ci.fyi_ios_builder(
short_name = 'ios13', short_name = 'ios13',
), ),
executable = 'recipe:chromium', executable = 'recipe:chromium',
os = os.MAC_10_15,
properties = { properties = {
'xcode_build_version': '11e146', 'xcode_build_version': '11e146',
}, },
...@@ -1766,9 +1768,11 @@ ci.fyi_ios_builder( ...@@ -1766,9 +1768,11 @@ ci.fyi_ios_builder(
category = 'iOS|iOS13', category = 'iOS|iOS13',
short_name = 'dev', short_name = 'dev',
), ),
caches = [xcode_cache.x11e608c],
executable = 'recipe:chromium', executable = 'recipe:chromium',
os = os.MAC_10_15,
properties = { properties = {
'xcode_build_version': '11e146', 'xcode_build_version': '11e608c',
}, },
) )
...@@ -1778,11 +1782,11 @@ ci.fyi_ios_builder( ...@@ -1778,11 +1782,11 @@ ci.fyi_ios_builder(
category = 'iOS|iOS13', category = 'iOS|iOS13',
short_name = 'sim', short_name = 'sim',
), ),
caches = [xcode_cache.x11e146], caches = [xcode_cache.x11e608c],
executable = 'recipe:chromium', executable = 'recipe:chromium',
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
'xcode_build_version': '11e146' 'xcode_build_version': '11e608c'
} }
) )
......
infra/config/subprojects/chromium/master-only/try.star
View file @ ac43d2e7
...@@ -571,6 +571,7 @@ try_.chromium_mac_ios_builder( ...@@ -571,6 +571,7 @@ try_.chromium_mac_ios_builder(
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,
properties = { properties = {
'xcode_build_version': '11e146', 'xcode_build_version': '11e146',
}, },
...@@ -598,15 +599,20 @@ try_.chromium_mac_ios_builder( ...@@ -598,15 +599,20 @@ try_.chromium_mac_ios_builder(
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = 'ios13-beta-simulator', name = 'ios13-beta-simulator',
executable = 'recipe:chromium_trybot', executable = 'recipe:chromium_trybot',
caches = [xcode_cache.x11e608c],
os = os.MAC_10_15,
properties = {
'xcode_build_version': '11e608c'
}
) )
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = 'ios13-sdk-simulator', name = 'ios13-sdk-simulator',
executable = 'recipe:chromium_trybot', executable = 'recipe:chromium_trybot',
caches = [xcode_cache.x11e146], caches = [xcode_cache.x11e608c],
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
'xcode_build_version': '11e146' 'xcode_build_version': '11e608c'
} }
) )
......
testing/buildbot/chromium.ci.json
View file @ ac43d2e7
This source diff could not be displayed because it is too large. You can view the blob instead.
testing/buildbot/chromium.fyi.json
View file @ ac43d2e7
This source diff could not be displayed because it is too large. You can view the blob instead.
testing/buildbot/test_suites.pyl
View file @ ac43d2e7
...@@ -5201,16 +5201,16 @@ ...@@ -5201,16 +5201,16 @@
'ios13_beta_simulator_tests': { 'ios13_beta_simulator_tests': {
'ios_common_tests': { 'ios_common_tests': {
'variants': [ 'variants': [
'SIM_IPHONE_X_13_4', 'SIM_IPHONE_X_13_5',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
], ],
}, },
'ios_eg2_tests': { 'ios_eg2_tests': {
'variants': [ 'variants': [
'SIM_IPHONE_X_13_4', 'SIM_IPHONE_X_13_5',
'SIM_IPHONE_7_13_4', 'SIM_IPHONE_7_13_5',
'SIM_IPAD_AIR_3RD_GEN_13_4', 'SIM_IPAD_AIR_3RD_GEN_13_5',
'SIM_IPAD_6_GEN_13_4', 'SIM_IPAD_6_GEN_13_5',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
'SIM_IPAD_AIR_3RD_GEN_12_4', 'SIM_IPAD_AIR_3RD_GEN_12_4',
'SIM_IPAD_6_GEN_12_4', 'SIM_IPAD_6_GEN_12_4',
...@@ -5218,10 +5218,10 @@ ...@@ -5218,10 +5218,10 @@
}, },
'ios_eg2_cq_tests': { 'ios_eg2_cq_tests': {
'variants': [ 'variants': [
'SIM_IPHONE_7_13_4', 'SIM_IPHONE_7_13_5',
'SIM_IPHONE_X_13_4', 'SIM_IPHONE_X_13_5',
'SIM_IPAD_PRO_13_4', 'SIM_IPAD_PRO_13_5',
'SIM_IPAD_6_GEN_13_4', 'SIM_IPAD_6_GEN_13_5',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
'SIM_IPAD_PRO_12_4', 'SIM_IPAD_PRO_12_4',
'SIM_IPAD_6_GEN_12_4', 'SIM_IPAD_6_GEN_12_4',
...@@ -5229,9 +5229,9 @@ ...@@ -5229,9 +5229,9 @@
}, },
'ios_screen_size_dependent_tests': { 'ios_screen_size_dependent_tests': {
'variants': [ 'variants': [
'SIM_IPHONE_6S_PLUS_13_4', 'SIM_IPHONE_6S_PLUS_13_5',
'SIM_IPHONE_X_13_4', 'SIM_IPHONE_X_13_5',
'SIM_IPAD_AIR_2_13_4', 'SIM_IPAD_AIR_2_13_5',
'SIM_IPHONE_6S_PLUS_12_4', 'SIM_IPHONE_6S_PLUS_12_4',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
'SIM_IPAD_AIR_2_12_4', 'SIM_IPAD_AIR_2_12_4',
...@@ -5248,9 +5248,9 @@ ...@@ -5248,9 +5248,9 @@
}, },
'ios_eg2_tests': { 'ios_eg2_tests': {
'variants': [ 'variants': [
'SIM_IPHONE_7_13_4', 'SIM_IPHONE_7_13_5',
'SIM_IPAD_AIR_2_13_4', 'SIM_IPAD_AIR_2_13_5',
'SIM_IPHONE_X_13_4', 'SIM_IPHONE_X_13_5',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
'SIM_IPAD_AIR_3RD_GEN_12_4', 'SIM_IPAD_AIR_3RD_GEN_12_4',
'SIM_IPAD_6_GEN_12_4', 'SIM_IPAD_6_GEN_12_4',
...@@ -5258,8 +5258,8 @@ ...@@ -5258,8 +5258,8 @@
}, },
'ios_eg2_cq_tests': { 'ios_eg2_cq_tests': {
'variants': [ 'variants': [
'SIM_IPHONE_X_13_4', 'SIM_IPHONE_X_13_5',
'SIM_IPAD_AIR_2_13_4', 'SIM_IPAD_AIR_2_13_5',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
'SIM_IPAD_PRO_12_4', 'SIM_IPAD_PRO_12_4',
'SIM_IPAD_6_GEN_12_4', 'SIM_IPAD_6_GEN_12_4',
...@@ -5267,8 +5267,8 @@ ...@@ -5267,8 +5267,8 @@
}, },
'ios_screen_size_dependent_tests': { 'ios_screen_size_dependent_tests': {
'variants': [ 'variants': [
'SIM_IPHONE_6S_PLUS_13_4', 'SIM_IPHONE_6S_PLUS_13_5',
'SIM_IPHONE_6S_13_4', 'SIM_IPHONE_6S_13_5',
'SIM_IPHONE_6S_PLUS_12_4', 'SIM_IPHONE_6S_PLUS_12_4',
'SIM_IPHONE_X_12_4', 'SIM_IPHONE_X_12_4',
'SIM_IPAD_AIR_2_12_4', 'SIM_IPAD_AIR_2_12_4',
......
testing/buildbot/variants.pyl
View file @ ac43d2e7
...@@ -77,14 +77,14 @@ ...@@ -77,14 +77,14 @@
], ],
'identifier': 'iPad Air (3rd generation) 12.4' 'identifier': 'iPad Air (3rd generation) 12.4'
}, },
'SIM_IPAD_AIR_3RD_GEN_13_4': { 'SIM_IPAD_AIR_3RD_GEN_13_5': {
'args': [ 'args': [
'--platform', '--platform',
'iPad Air (3rd generation)', 'iPad Air (3rd generation)',
'--version', '--version',
'13.4' '13.5'
], ],
'identifier': 'iPad Air (3rd generation) 13.4' 'identifier': 'iPad Air (3rd generation) 13.5'
}, },
'SIM_IPAD_PRO_12_4': { 'SIM_IPAD_PRO_12_4': {
'args': [ 'args': [
...@@ -95,14 +95,14 @@ ...@@ -95,14 +95,14 @@
], ],
'identifier': 'iPad Pro (12.9-inch) 12.4' 'identifier': 'iPad Pro (12.9-inch) 12.4'
}, },
'SIM_IPAD_PRO_13_4': { 'SIM_IPAD_PRO_13_5': {
'args': [ 'args': [
'--platform', '--platform',
'iPad Pro (12.9-inch)', 'iPad Pro (12.9-inch)',
'--version', '--version',
'13.4', '13.5',
], ],
'identifier': 'iPad Pro (12.9-inch) 13.4' 'identifier': 'iPad Pro (12.9-inch) 13.5'
}, },
'SIM_IPAD_6_GEN_12_4': { 'SIM_IPAD_6_GEN_12_4': {
'args': [ 'args': [
...@@ -113,14 +113,14 @@ ...@@ -113,14 +113,14 @@
], ],
'identifier': 'iPad (6th generation) 12.4' 'identifier': 'iPad (6th generation) 12.4'
}, },
'SIM_IPAD_6_GEN_13_4': { 'SIM_IPAD_6_GEN_13_5': {
'args': [ 'args': [
'--platform', '--platform',
'iPad (6th generation)', 'iPad (6th generation)',
'--version', '--version',
'13.4', '13.5',
], ],
'identifier': 'iPad (6th generation) 13.4' 'identifier': 'iPad (6th generation) 13.5'
}, },
'SIM_IPHONE_6S_12_4': { 'SIM_IPHONE_6S_12_4': {
'args': [ 'args': [
...@@ -140,6 +140,15 @@ ...@@ -140,6 +140,15 @@
], ],
'identifier': 'iPhone 6s 13.4' 'identifier': 'iPhone 6s 13.4'
}, },
'SIM_IPHONE_6S_13_5': {
'args': [
'--platform',
'iPhone 6s',
'--version',
'13.5',
],
'identifier': 'iPhone 6s 13.5'
},
'SIM_IPHONE_6S_PLUS_12_4': { 'SIM_IPHONE_6S_PLUS_12_4': {
'args': [ 'args': [
'--platform', '--platform',
...@@ -158,6 +167,15 @@ ...@@ -158,6 +167,15 @@
], ],
'identifier': 'iPhone 6s Plus 13.4' 'identifier': 'iPhone 6s Plus 13.4'
}, },
'SIM_IPHONE_6S_PLUS_13_5': {
'args': [
'--platform',
'iPhone 6s Plus',
'--version',
'13.5',
],
'identifier': 'iPhone 6s Plus 13.5'
},
'SIM_IPHONE_7_13_4': { 'SIM_IPHONE_7_13_4': {
'args': [ 'args': [
'--platform', '--platform',
...@@ -167,6 +185,15 @@ ...@@ -167,6 +185,15 @@
], ],
'identifier': 'iPhone 7 13.4' 'identifier': 'iPhone 7 13.4'
}, },
'SIM_IPHONE_7_13_5': {
'args': [
'--platform',
'iPhone 7',
'--version',
'13.5',
],
'identifier': 'iPhone 7 13.5'
},
'SIM_IPHONE_SE_13_4': { 'SIM_IPHONE_SE_13_4': {
'args': [ 'args': [
'--platform', '--platform',
......
testing/buildbot/waterfalls.pyl
View file @ ac43d2e7
...@@ -2033,7 +2033,7 @@ ...@@ -2033,7 +2033,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_11e146', 'xcode_11e608c',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios13_beta_simulator_tests' 'isolated_scripts': 'ios13_beta_simulator_tests'
...@@ -2052,7 +2052,7 @@ ...@@ -2052,7 +2052,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_11e146', 'xcode_11e608c',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios13_sdk_simulator_tests' 'isolated_scripts': 'ios13_sdk_simulator_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