Skip to content

GitLab

T
tangled
Commit c7b9fb0b authored by Jeff Yoon's avatar Jeff Yoon Committed by Commit Bot
Browse files
Options

chromium.fyi ios13-beta-simulator src-side migration for Chromium 

* ci.star - ios13-beta-sim to run Chromium recipe
* mb_config.pyl - GN arguments for ios13-beta-sim
* testing/*.pyl, *.json - tests to bind to ios13-beta-sim
  * Replaced contents of ios-sim-cr-recipe with this as it is no
    longer needed. All introduced content (mixins, waterfall,
    test_suites) need a mapping, so I've replaced it as part of
    clean up as well.
* gn_isolate_map.pyl - updating all iOS test targets to generated
  scripts. Remains backwards compatible to iOS as required files
  are still there for iOS recipe consumption.
* BUILD.gn files - adding shard values for test targets that
  utilize parallelization via test runner.

Bug: 1055164
Change-Id: Id36ffdecd2935cacdf4825c99f26d2f6b561200d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2085118Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748770}
parent 51373839
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6945 additions and 105 deletions
infra/config/buckets/ci.star
View file @ c7b9fb0b
...@@ -1176,6 +1176,10 @@ ci.fyi_ios_builder( ...@@ -1176,6 +1176,10 @@ ci.fyi_ios_builder(
ci.fyi_ios_builder( ci.fyi_ios_builder(
name = 'ios13-beta-simulator', name = 'ios13-beta-simulator',
executable = 'recipe:chromium',
properties = {
'xcode_build_version': '11c29',
},
) )
ci.fyi_ios_builder( ci.fyi_ios_builder(
......
infra/config/generated/cr-buildbucket.cfg
View file @ c7b9fb0b
...@@ -6954,11 +6954,12 @@ buckets: < ...@@ -6954,11 +6954,12 @@ buckets: <
dimensions: "cpu:x86-64" dimensions: "cpu:x86-64"
dimensions: "os:Mac" dimensions: "os:Mac"
recipe: < recipe: <
name: "ios/unified_builder_tester" name: "chromium"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
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:\"11c29\""
> >
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches: < caches: <
......
ios/chrome/test/earl_grey/BUILD.gn
View file @ c7b9fb0b
...@@ -54,6 +54,8 @@ chrome_ios_eg_test("ios_chrome_reading_list_egtests") { ...@@ -54,6 +54,8 @@ chrome_ios_eg_test("ios_chrome_reading_list_egtests") {
chrome_ios_eg_test("ios_chrome_bookmarks_egtests") { chrome_ios_eg_test("ios_chrome_bookmarks_egtests") {
deps = [ "//ios/chrome/browser/ui/bookmarks:eg_tests" ] deps = [ "//ios/chrome/browser/ui/bookmarks:eg_tests" ]
shards = 3
} }
chrome_ios_eg_test("ios_chrome_signin_egtests") { chrome_ios_eg_test("ios_chrome_signin_egtests") {
...@@ -99,6 +101,8 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") { ...@@ -99,6 +101,8 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") {
"//ios/chrome/browser/ui/toolbar:eg_tests", "//ios/chrome/browser/ui/toolbar:eg_tests",
"//ios/chrome/browser/ui/webui:eg_tests", "//ios/chrome/browser/ui/webui:eg_tests",
] ]
shards = 2
} }
chrome_ios_eg_test("ios_chrome_web_egtests") { chrome_ios_eg_test("ios_chrome_web_egtests") {
......
ios/chrome/test/earl_grey2/BUILD.gn
View file @ c7b9fb0b
...@@ -130,6 +130,8 @@ chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") { ...@@ -130,6 +130,8 @@ chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") {
"//ios/chrome/browser/ui/webui:eg2_tests", "//ios/chrome/browser/ui/webui:eg2_tests",
] ]
data_deps = [ ":ios_chrome_eg2tests" ] data_deps = [ ":ios_chrome_eg2tests" ]
shards = 2
} }
chrome_ios_eg2_test("ios_chrome_web_eg2tests_module") { chrome_ios_eg2_test("ios_chrome_web_eg2tests_module") {
......
testing/buildbot/chromium.fyi.json
View file @ c7b9fb0b
This diff is collapsed.
testing/buildbot/gn_isolate_map.pyl
View file @ c7b9fb0b
...@@ -895,148 +895,183 @@ ...@@ -895,148 +895,183 @@
"ios_chrome_bookmarks_egtests": { "ios_chrome_bookmarks_egtests": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey:ios_chrome_bookmarks_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_bookmarks_egtests",
"type": "raw", "script": "bin/run_ios_chrome_bookmarks_egtests",
"type": "generated_script",
}, },
"ios_chrome_integration_egtests": { "ios_chrome_integration_egtests": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey:ios_chrome_integration_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_integration_egtests",
"type": "raw", "script": "bin/run_ios_chrome_integration_egtests",
"type": "generated_script",
}, },
"ios_chrome_reading_list_egtests": { "ios_chrome_reading_list_egtests": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey:ios_chrome_reading_list_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_reading_list_egtests",
"type": "raw", "script": "bin/run_ios_chrome_reading_list_egtests",
"type": "generated_script",
}, },
"ios_chrome_settings_egtests": { "ios_chrome_settings_egtests": {
"args": [ "args": [
"--enable-features=ClearSyncedData", "--enable-features=ClearSyncedData",
], ],
"label": "//ios/chrome/test/earl_grey:ios_chrome_settings_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_settings_egtests",
"type": "raw", "script": "bin/run_ios_chrome_settings_egtests",
"type": "generated_script",
}, },
"ios_chrome_signin_egtests": { "ios_chrome_signin_egtests": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey:ios_chrome_signin_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_signin_egtests",
"type": "raw", "script": "bin/run_ios_chrome_signin_egtests",
"type": "generated_script",
}, },
"ios_chrome_translate_egtests": { "ios_chrome_translate_egtests": {
"label": "//ios/chrome/test/earl_grey:ios_chrome_translate_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_translate_egtests",
"type": "raw", "script": "bin/run_ios_chrome_translate_egtests",
"type": "generated_script",
}, },
"ios_chrome_smoke_egtests": { "ios_chrome_smoke_egtests": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey:ios_chrome_smoke_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_smoke_egtests",
"type": "raw", "script": "bin/run_ios_chrome_smoke_egtests",
"type": "generated_script",
}, },
"ios_chrome_ui_egtests": { "ios_chrome_ui_egtests": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey:ios_chrome_ui_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_ui_egtests",
"type": "raw", "script": "bin/run_ios_chrome_ui_egtests",
"type": "generated_script",
}, },
"ios_chrome_unittests": { "ios_chrome_unittests": {
"args": [], "args": [],
"label": "//ios/chrome/test:ios_chrome_unittests", "label": "//ios/chrome/test:ios_chrome_unittests",
"type": "raw", "script": "bin/run_ios_chrome_unittests",
"type": "generated_script",
}, },
"ios_chrome_web_egtests": { "ios_chrome_web_egtests": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey:ios_chrome_web_egtests", "label": "//ios/chrome/test/earl_grey:ios_chrome_web_egtests",
"type": "raw", "script": "bin/run_ios_chrome_web_egtests",
"type": "generated_script",
}, },
"ios_chrome_bookmarks_eg2tests_module": { "ios_chrome_bookmarks_eg2tests_module": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey2:ios_chrome_bookmarks_eg2tests_module", "label": "//ios/chrome/test/earl_grey2:ios_chrome_bookmarks_eg2tests_module",
"type": "raw", "script": "bin/run_ios_chrome_bookmarks_eg2tests_module",
"type": "generated_script",
}, },
"ios_chrome_integration_eg2tests_module": { "ios_chrome_integration_eg2tests_module": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey2:ios_chrome_integration_eg2tests_module", "label": "//ios/chrome/test/earl_grey2:ios_chrome_integration_eg2tests_module",
"type": "raw", "script": "bin/run_ios_chrome_integration_eg2tests_module",
"type": "generated_script",
}, },
"ios_chrome_settings_eg2tests_module": { "ios_chrome_settings_eg2tests_module": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey2:ios_chrome_settings_eg2tests_module", "label": "//ios/chrome/test/earl_grey2:ios_chrome_settings_eg2tests_module",
"type": "raw", "script": "bin/run_ios_chrome_settings_eg2tests_module",
"type": "generated_script",
}, },
"ios_chrome_signin_eg2tests_module": { "ios_chrome_signin_eg2tests_module": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey2:ios_chrome_signin_eg2tests_module", "label": "//ios/chrome/test/earl_grey2:ios_chrome_signin_eg2tests_module",
"type": "raw", "script": "bin/run_ios_chrome_signin_eg2tests_module",
"type": "generated_script",
}, },
"ios_chrome_smoke_eg2tests_module": { "ios_chrome_smoke_eg2tests_module": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey2:ios_chrome_smoke_eg2tests_module", "label": "//ios/chrome/test/earl_grey2:ios_chrome_smoke_eg2tests_module",
"type": "raw", "script": "bin/run_ios_chrome_smoke_eg2tests_module",
"type": "generated_script",
}, },
"ios_chrome_ui_eg2tests_module": { "ios_chrome_ui_eg2tests_module": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey2:ios_chrome_ui_eg2tests_module", "label": "//ios/chrome/test/earl_grey2:ios_chrome_ui_eg2tests_module",
"type": "raw", "script": "bin/run_ios_chrome_ui_eg2tests_module",
"type": "generated_script",
}, },
"ios_chrome_web_eg2tests_module": { "ios_chrome_web_eg2tests_module": {
"args": [], "args": [],
"label": "//ios/chrome/test/earl_grey2:ios_chrome_web_eg2tests_module", "label": "//ios/chrome/test/earl_grey2:ios_chrome_web_eg2tests_module",
"type": "raw", "script": "bin/run_ios_chrome_web_eg2tests_module",
"type": "generated_script",
}, },
"ios_crash_xcuitests_module": { "ios_crash_xcuitests_module": {
"args": [], "args": [],
"label": "//third_party/crashpad/crashpad/test/ios:ios_crash_xcuitests_module", "label": "//third_party/crashpad/crashpad/test/ios:ios_crash_xcuitests_module",
"type": "raw", "script": "bin/run_ios_crash_xcuitests_module",
}, "type": "generated_script",
"ios_web_shell_eg2tests_module": {
"args": [],
"label": "//ios/web/shell/test:ios_web_shell_eg2tests_module",
"type": "raw",
}, },
"ios_components_unittests": { "ios_components_unittests": {
"args": [], "args": [],
"label": "//ios/components:ios_components_unittests", "label": "//ios/components:ios_components_unittests",
"type": "raw", "script": "bin/run_ios_components_unittests",
"type": "generated_script",
}, },
"ios_net_unittests": { "ios_net_unittests": {
"args": [], "args": [],
"label": "//ios/net:ios_net_unittests", "label": "//ios/net:ios_net_unittests",
"type": "raw", "script": "bin/run_ios_net_unittests",
"type": "generated_script",
}, },
"ios_remoting_unittests": { "ios_remoting_unittests": {
"args": [], "args": [],
"label": "//remoting/ios:ios_remoting_unittests", "label": "//remoting/ios:ios_remoting_unittests",
"type": "raw", "script": "bin/run_ios_remoting_unittests",
"type": "generated_script",
}, },
"ios_showcase_egtests": { "ios_showcase_egtests": {
"args": [], "args": [],
"label": "//ios/showcase:ios_showcase_egtests", "label": "//ios/showcase:ios_showcase_egtests",
"type": "raw", "script": "bin/run_ios_showcase_egtests",
"type": "generated_script",
}, },
"ios_showcase_eg2tests_module": { "ios_showcase_eg2tests_module": {
"args":[], "args":[],
"label": "//ios/showcase:ios_showcase_eg2tests_module", "label": "//ios/showcase:ios_showcase_eg2tests_module",
"type": "raw", "script": "bin/run_ios_showcase_eg2tests_module",
"type": "generated_script",
},
"ios_testing_unittests": {
"args": [],
"label": "//ios/testing:ios_testing_unittests",
"script": "bin/run_ios_testing_unittests",
"type": "generated_script",
}, },
"ios_web_inttests": { "ios_web_inttests": {
"args": [], "args": [],
"label": "//ios/web:ios_web_inttests", "label": "//ios/web:ios_web_inttests",
"type": "raw", "script": "bin/run_ios_web_inttests",
"type": "generated_script",
},
"ios_web_shell_eg2tests_module": {
"args": [],
"label": "//ios/web/shell/test:ios_web_shell_eg2tests_module",
"script": "bin/run_ios_web_shell_eg2tests_module",
"type": "generated_script",
}, },
"ios_web_shell_egtests": { "ios_web_shell_egtests": {
"args": [], "args": [],
"label": "//ios/web/shell/test:ios_web_shell_egtests", "label": "//ios/web/shell/test:ios_web_shell_egtests",
"type": "raw", "script": "bin/run_ios_web_shell_egtests",
"type": "generated_script",
}, },
"ios_web_unittests": { "ios_web_unittests": {
"args": [], "args": [],
"label": "//ios/web:ios_web_unittests", "label": "//ios/web:ios_web_unittests",
"type": "raw", "script": "bin/run_ios_web_unittests",
"type": "generated_script",
}, },
"ios_web_view_inttests": { "ios_web_view_inttests": {
"args": [], "args": [],
"label": "//ios/web_view:ios_web_view_inttests", "label": "//ios/web_view:ios_web_view_inttests",
"type": "raw", "script": "bin/run_ios_web_view_inttests",
"type": "generated_script",
}, },
"ios_web_view_unittests": { "ios_web_view_unittests": {
"args": [], "args": [],
"label": "//ios/web_view:ios_web_view_unittests", "label": "//ios/web_view:ios_web_view_unittests",
"type": "raw", "script": "bin/run_ios_web_view_unittests",
"type": "generated_script",
}, },
"ipc_tests": { "ipc_tests": {
"label": "//ipc:ipc_tests", "label": "//ipc:ipc_tests",
...@@ -1290,11 +1325,6 @@ ...@@ -1290,11 +1325,6 @@
"label": "//third_party/opus:opus_tests", "label": "//third_party/opus:opus_tests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"ios_testing_unittests": {
"args": [],
"label": "//ios/testing:ios_testing_unittests",
"type": "raw",
},
"openscreen_unittests": { "openscreen_unittests": {
"label": "//chrome/browser/media/router:openscreen_unittests", "label": "//chrome/browser/media/router:openscreen_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
......
testing/buildbot/mixins.pyl
View file @ c7b9fb0b
...@@ -227,18 +227,16 @@ ...@@ -227,18 +227,16 @@
}, },
}, },
}, },
'host_mac_10.14': { 'intel_iris_5100': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
'host os': 'Mac-10.14.6', 'gpu': '8086:0a2e',
}, },
}, },
}, },
'intel_iris_5100': { 'ios_swarming_account': {
'swarming': { 'swarming': {
'dimensions': { 'service_account': 'ios-isolated-tester@chops-service-accounts.iam.gserviceaccount.com'
'gpu': '8086:0a2e',
},
}, },
}, },
'kitkat': { 'kitkat': {
...@@ -475,6 +473,17 @@ ...@@ -475,6 +473,17 @@
}, },
}, },
}, },
'mac_toolchain': {
'swarming': {
'cipd_packages': [
{
"cipd_package": 'infra/tools/mac_toolchain/${platform}',
'location': '.',
'revision': 'git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a',
},
],
},
},
'marshmallow': { 'marshmallow': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
...@@ -536,6 +545,14 @@ ...@@ -536,6 +545,14 @@
}, },
}, },
}, },
'out_dir_arg': {
'$mixin_append': {
'args': [
'--out-dir',
'${ISOLATED_OUTDIR}'
],
},
},
'pie-x86-emulator': { 'pie-x86-emulator': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
...@@ -734,16 +751,12 @@ ...@@ -734,16 +751,12 @@
}, },
'xcode_11c29': { 'xcode_11c29': {
'swarming': { 'swarming': {
'dimensions': { 'named_caches': [
'xcode_build_version': '11c29', {
}, 'name': 'xcode_ios_11c29',
}, 'path': 'Xcode.app',
}, },
'xcode_parallelization': { ],
'swarming': {
'dimensions': {
'xcode_parallelization': 'true',
},
}, },
}, },
} }
testing/buildbot/test_suites.pyl
View file @ c7b9fb0b
...@@ -2642,39 +2642,236 @@ ...@@ -2642,39 +2642,236 @@
'ios_components_unittests': {}, 'ios_components_unittests': {},
}, },
'ios_common_tests': {
'boringssl_crypto_tests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'boringssl_ssl_tests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'crypto_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'google_apis_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_components_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_net_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_remoting_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_testing_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'net_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'services_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'sql_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'url_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
},
'ios_eg2_tests': { 'ios_eg2_tests': {
'ios_chrome_bookmarks_eg2tests_module': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_chrome_integration_eg2tests_module': { 'ios_chrome_integration_eg2tests_module': {
'app': 'ios_chrome_integration_eg2tests_module', 'merge': {
'host': 'ios_chrome_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
}, },
'ios_chrome_settings_eg2tests_module': { 'ios_chrome_settings_eg2tests_module': {
'app': 'ios_chrome_settings_eg2tests_module', 'merge': {
'host': 'ios_chrome_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
}, },
'ios_chrome_signin_eg2tests_module': { 'ios_chrome_signin_eg2tests_module': {
'app': 'ios_chrome_signin_eg2tests_module', 'merge': {
'host': 'ios_chrome_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
}, },
'ios_chrome_smoke_eg2tests_module': { 'ios_chrome_smoke_eg2tests_module': {
'app': 'ios_chrome_smoke_eg2tests_module', 'merge': {
'host': 'ios_chrome_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
}, },
'ios_chrome_ui_eg2tests_module': { 'ios_chrome_ui_eg2tests_module': {
'app': 'ios_chrome_ui_eg2tests_module', 'merge': {
'host': 'ios_chrome_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
'shards': 2, },
'swarming': {
'shards': 2,
}
}, },
'ios_chrome_web_eg2tests_module': { 'ios_chrome_web_eg2tests_module': {
'app': 'ios_chrome_web_eg2tests_module', 'merge': {
'host': 'ios_chrome_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
}, },
'ios_showcase_eg2tests_module': { 'ios_showcase_eg2tests_module': {
'app': 'ios_showcase_eg2tests_module', 'merge': {
'host': 'ios_showcase_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
}, },
'ios_web_shell_eg2tests_module': { 'ios_web_shell_eg2tests_module': {
'app': 'ios_web_shell_eg2tests_module', 'merge': {
'host': 'ios_web_shell_eg2tests', 'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
},
'ios_eg_cq_tests': {
'ios_chrome_integration_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
},
'swarming': {
'shards': 3,
}
},
'ios_chrome_signin_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
},
},
'ios_chrome_ui_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
},
'swarming': {
'shards': 5,
}
},
'ios_web_shell_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
},
'ios_eg_tests': {
'ios_chrome_bookmarks_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_chrome_reading_list_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_chrome_settings_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
},
'swarming': {
'shards': 3,
}
},
'ios_chrome_translate_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_chrome_web_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_showcase_egtests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
},
'ios_screen_size_dependent_tests': {
'base_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'components_unittests': {
'merge': {
'args': [],
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'gfx_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_chrome_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_web_inttests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_web_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_web_view_inttests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ios_web_view_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'skia_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
},
'ui_base_unittests': {
'merge': {
'script': '//testing/merge_scripts/standard_isolated_script_merge.py'
}
}, },
}, },
...@@ -4509,31 +4706,48 @@ ...@@ -4509,31 +4706,48 @@
'matrix_compound_suites': { 'matrix_compound_suites': {
# This is a sample and is not functional 'ios13_beta_simulator_gtests': {
'ios_simulator_cr_recipe_gtests': { 'ios_common_tests': {
'ios_eg2_tests': { 'variants': [
'swarming': { 'SIM_IPHONE_X_13_3',
'dimension_sets': [ 'SIM_IPHONE_X_12_4',
{ ],
'device type': 'iPhone X',
'os': '13.3',
},
{
'device type': 'iPhone 7',
'os': '13.3',
},
{
'device type': 'iPhone X',
'os': '12.4',
},
{
'device type': 'iPad (6th generation)',
'os': '12.4',
},
],
},
}, },
}, 'ios_eg2_tests': {
'variants': [
'SIM_IPHONE_X_13_3',
'SIM_IPHONE_7_13_3',
'SIM_IPAD_6_GEN_13_3',
'SIM_IPHONE_X_12_4',
'SIM_IPAD_6_GEN_12_4',
]
},
'ios_eg_cq_tests': {
'variants': [
'SIM_IPHONE_X_13_3',
'SIM_IPAD_PRO_13_3',
'SIM_IPHONE_X_12_4',
'SIM_IPAD_PRO_12_4',
]
},
'ios_eg_tests': {
'variants': [
'SIM_IPHONE_X_13_3',
'SIM_IPAD_AIR_3RD_GEN_13_3',
'SIM_IPHONE_X_12_4',
'SIM_IPAD_AIR_3RD_GEN_12_4',
]
},
'ios_screen_size_dependent_tests': {
'variants': [
'SIM_IPHONE_6S_PLUS_13_3',
'SIM_IPHONE_X_13_3',
'SIM_IPAD_AIR_2_13_3',
'SIM_IPHONE_6S_PLUS_12_4',
'SIM_IPHONE_X_12_4',
'SIM_IPAD_AIR_2_12_4',
],
},
}
} }
} }
testing/buildbot/variants.pyl
View file @ c7b9fb0b
...@@ -8,4 +8,122 @@ ...@@ -8,4 +8,122 @@
# * comments are allowed, using '#' syntax; and # * comments are allowed, using '#' syntax; and
# * trailing commas are allowed. # * trailing commas are allowed.
{} {
'SIM_IPAD_AIR_2_12_4': {
'args': [
'--platform',
'iPad Air 2',
'--version',
'12.4'
],
'identifier': 'iPad Air 2 12.4'
},
'SIM_IPAD_AIR_2_13_3': {
'args': [
'--platform',
'iPad Air 2',
'--version',
'13.3'
],
'identifier': 'iPad Air 2 13.3'
},
'SIM_IPAD_AIR_3RD_GEN_12_4': {
'args': [
'--platform',
'iPad Air (3rd generation)',
'--version',
'12.4'
],
'identifier': 'iPad Air (3rd generation) 12.4'
},
'SIM_IPAD_AIR_3RD_GEN_13_3': {
'args': [
'--platform',
'iPad Air (3rd generation)',
'--version',
'13.3'
],
'identifier': 'iPad Air (3rd generation) 13.3'
},
'SIM_IPAD_PRO_12_4': {
'args': [
'--platform',
'iPad Pro (12.9-inch)',
'--version',
'12.4',
],
'identifier': 'iPad Pro (12.9-inch) 12.4'
},
'SIM_IPAD_PRO_13_3': {
'args': [
'--platform',
'iPad Pro (12.9-inch)',
'--version',
'13.3',
],
'identifier': 'iPad Pro (12.9-inch) 13.3'
},
'SIM_IPAD_6_GEN_12_4': {
'args': [
'--platform',
'iPad (6th generation)',
'--version',
'12.4',
],
'identifier': 'iPad (6th generation) 12.4'
},
'SIM_IPAD_6_GEN_13_3': {
'args': [
'--platform',
'iPad (6th generation)',
'--version',
'13.3',
],
'identifier': 'iPad (6th generation) 13.3'
},
'SIM_IPHONE_6S_PLUS_12_4': {
'args': [
'--platform',
'iPhone 6s Plus',
'--version',
'12.4',
],
'identifier': 'iPhone 6s Plus 12.4'
},
'SIM_IPHONE_6S_PLUS_13_3': {
'args': [
'--platform',
'iPhone 6s Plus',
'--version',
'13.3',
],
'identifier': 'iPhone 6s Plus 13.3'
},
'SIM_IPHONE_7_13_3': {
'args': [
'--platform',
'iPhone 7',
'--version',
'13.3',
],
'identifier': 'iPhone 7 13.3'
},
'SIM_IPHONE_X_12_4': {
'args': [
'--platform',
'iPhone X',
'--version',
'12.4',
],
'identifier': 'iPhone X 12.4'
},
'SIM_IPHONE_X_13_3': {
'args': [
'--platform',
'iPhone X',
'--version',
'13.3',
],
'identifier': 'iPhone X 13.3'
},
}
testing/buildbot/waterfalls.pyl
View file @ c7b9fb0b
...@@ -1775,15 +1775,19 @@ ...@@ -1775,15 +1775,19 @@
'gtest_tests': 'ios_code_coverage_gtests', 'gtest_tests': 'ios_code_coverage_gtests',
}, },
}, },
'ios-simulator-cr-recipe': { 'ios13-beta-simulator': {
'additional_compile_targets': [
'all',
],
'mixins': [ 'mixins': [
'chrome-swarming-pool', 'ios_swarming_account',
'host_mac_10.14', 'mac_10.14',
'mac_toolchain',
'out_dir_arg',
'xcode_11c29', 'xcode_11c29',
'xcode_parallelization',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'ios_simulator_cr_recipe_gtests', 'gtest_tests': 'ios13_beta_simulator_gtests'
}, },
}, },
'linux-annotator-rel': { 'linux-annotator-rel': {
......
tools/mb/mb_config.pyl
View file @ c7b9fb0b
...@@ -235,6 +235,7 @@ ...@@ -235,6 +235,7 @@
'fuchsia-fyi-arm64-rel': 'release_bot_fuchsia_arm64', 'fuchsia-fyi-arm64-rel': 'release_bot_fuchsia_arm64',
'fuchsia-fyi-x64-dbg': 'debug_bot_fuchsia', 'fuchsia-fyi-x64-dbg': 'debug_bot_fuchsia',
'fuchsia-fyi-x64-rel': 'release_bot_fuchsia', 'fuchsia-fyi-x64-rel': 'release_bot_fuchsia',
'ios13-beta-simulator': 'ios_simulator_debug_static_bot',
'ios-simulator': 'ios_error', 'ios-simulator': 'ios_error',
'ios-simulator-code-coverage': 'clang_code_coverage_ios', 'ios-simulator-code-coverage': 'clang_code_coverage_ios',
'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot', 'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot',
......
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