Skip to content

GitLab

T
tangled
Commit d5b71746 authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot
Browse files
Options

Run Android network service APK tests on the main waterfall 

This runs chrome_public_test_apk and content_shell_test_apk on the phone
testers in the main waterfall. We will be going to canary and dev on
Android for network service soon, so want to make sure things don't
break.

For now, not running content_browsertests or components_browsertests for
capacity reasons, and these are much less likely to break since they are
also covered by the desktop bots.

Bug: 827531
Change-Id: I9140bfc3de18f8c29177fa2e92f0129534ea3292
Reviewed-on: https://chromium-review.googlesource.com/c/1355601
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614841}
parent 89aeefbc
Hide whitespace changes
Inline Side-by-side
Showing with 424 additions and 22 deletions
testing/buildbot/chromium.android.fyi.json
View file @ d5b71746
...@@ -1374,6 +1374,55 @@ ...@@ -1374,6 +1374,55 @@
}, },
"test": "chrome_public_test_apk" "test": "chrome_public_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_chrome_public_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "NRD91N",
"device_type": "bullhead",
"os": "Android"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 20
},
"test": "chrome_public_test_apk"
},
{ {
"args": [ "args": [
"--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json", "--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
...@@ -1653,6 +1702,54 @@ ...@@ -1653,6 +1702,54 @@
}, },
"test": "content_shell_test_apk" "test": "content_shell_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_content_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_content_shell_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "NRD91N",
"device_type": "bullhead",
"os": "Android"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 5
},
"test": "content_shell_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -3834,6 +3931,35 @@ ...@@ -3834,6 +3931,35 @@
}, },
"test": "chrome_public_test_apk" "test": "chrome_public_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_chrome_public_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho",
"os": "Android"
}
],
"shards": 20
},
"test": "chrome_public_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -3965,6 +4091,34 @@ ...@@ -3965,6 +4091,34 @@
}, },
"test": "content_shell_test_apk" "test": "content_shell_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_content_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_content_shell_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho",
"os": "Android"
}
],
"shards": 5
},
"test": "content_shell_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
testing/buildbot/chromium.android.json
View file @ d5b71746
...@@ -6490,6 +6490,55 @@ ...@@ -6490,6 +6490,55 @@
}, },
"test": "chrome_public_test_apk" "test": "chrome_public_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_chrome_public_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48I",
"device_type": "hammerhead",
"os": "Android"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 20
},
"test": "chrome_public_test_apk"
},
{ {
"args": [ "args": [
"--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json", "--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
...@@ -6769,6 +6818,54 @@ ...@@ -6769,6 +6818,54 @@
}, },
"test": "content_shell_test_apk" "test": "content_shell_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_content_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_content_shell_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "LMY48I",
"device_type": "hammerhead",
"os": "Android"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 5
},
"test": "content_shell_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -11945,6 +12042,54 @@ ...@@ -11945,6 +12042,54 @@
}, },
"test": "chrome_public_test_apk" "test": "chrome_public_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"experiment_percentage": 100,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_chrome_public_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 20
},
"test": "chrome_public_test_apk"
},
{ {
"args": [ "args": [
"--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json", "--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
...@@ -12212,6 +12357,52 @@ ...@@ -12212,6 +12357,52 @@
}, },
"test": "content_shell_test_apk" "test": "content_shell_test_apk"
}, },
{
"args": [
"--enable-features=NetworkService",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_content_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_content_shell_test_apk",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 5
},
"test": "content_shell_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
testing/buildbot/test_suite_exceptions.pyl
View file @ d5b71746
...@@ -220,6 +220,8 @@ ...@@ -220,6 +220,8 @@
'mac-rel', 'mac-rel',
], ],
}, },
# Note: keep experiment percentages the same as
# network_service_chrome_public_test_apk.
'chrome_public_test_apk': { 'chrome_public_test_apk': {
'modifications': { 'modifications': {
# chromium.android # chromium.android
...@@ -766,6 +768,37 @@ ...@@ -766,6 +768,37 @@
}, },
}, },
}, },
# Note: keep experiment percentages the same as chrome_public_test_apk.
'network_service_chrome_public_test_apk': {
# Only run these on the phone testers for now due to capacity.
'remove_from': [
# chromium.android
'android-kitkat-arm-rel',
'android-marshmallow-arm64-rel',
'KitKat Tablet Tester',
'Lollipop Tablet Tester',
'Marshmallow Tablet Tester',
'KitKat Phone Tester (dbg)',
# chromium.android.fyi
'x86 Cloud Tester',
# chromium.memory
'Android CFI',
# chromium.clang
'ToTAndroid',
'ToTAndroidCFI',
],
'modifications': {
# chromium.android
'Marshmallow 64 bit Tester': {
# TODO(crbug.com/731759): Enable this once we're confident that it
# passes.
'experiment_percentage': 100,
},
'Oreo Phone Tester': {
'experiment_percentage': 100,
},
},
},
'network_service_components_browsertests': { 'network_service_components_browsertests': {
'remove_from': [ 'remove_from': [
# chromium.memory # chromium.memory
...@@ -806,6 +839,25 @@ ...@@ -806,6 +839,25 @@
'ToTMacASan', 'ToTMacASan',
], ],
}, },
'network_service_content_shell_test_apk': {
# Only run these on the phone testers for now due to capacity.
'remove_from': [
# chromium.android
'android-kitkat-arm-rel',
'android-marshmallow-arm64-rel',
'KitKat Tablet Tester',
'Lollipop Tablet Tester',
'Marshmallow Tablet Tester',
'KitKat Phone Tester (dbg)',
# chromium.android.fyi
'x86 Cloud Tester',
# chromium.memory
'Android CFI',
# chromium.clang
'ToTAndroid',
'ToTAndroidCFI',
],
},
'network_service_extensions_browsertests': { 'network_service_extensions_browsertests': {
'remove_from': [ 'remove_from': [
# chromium.memory # chromium.memory
......
testing/buildbot/test_suites.pyl
View file @ d5b71746
...@@ -1992,7 +1992,7 @@ ...@@ -1992,7 +1992,7 @@
'monochrome_apk_checker': {}, 'monochrome_apk_checker': {},
}, },
'network_service_android_gtests': { 'network_service_android_fyi_gtests': {
'network_service_content_browsertests': { 'network_service_content_browsertests': {
'args': [ 'args': [
'--enable-features=NetworkService', '--enable-features=NetworkService',
...@@ -2009,27 +2009,6 @@ ...@@ -2009,27 +2009,6 @@
], ],
'test': 'components_browsertests', 'test': 'components_browsertests',
}, },
'network_service_chrome_public_test_apk': {
'swarming': {
'shards': 20,
},
'args': [
# TODO(crbug.com/881572): Fix crash when running network service OOP on
# Android.
'--enable-features=NetworkService',
'--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter',
],
'test': 'chrome_public_test_apk',
},
'network_service_content_shell_test_apk': {
'swarming': {
'shards': 5,
},
'args': [
'--enable-features=NetworkService',
],
'test': 'content_shell_test_apk',
},
'network_service_webview_instrumentation_test_apk': { 'network_service_webview_instrumentation_test_apk': {
'swarming': { 'swarming': {
'shards': 20, 'shards': 20,
...@@ -2079,6 +2058,30 @@ ...@@ -2079,6 +2058,30 @@
}, },
}, },
# These tests will be run on the main waterfall in addition to the Mojo
# Android bot.
'network_service_android_gtests': {
'network_service_chrome_public_test_apk': {
'swarming': {
'shards': 20,
},
'args': [
'--enable-features=NetworkService',
'--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter',
],
'test': 'chrome_public_test_apk',
},
'network_service_content_shell_test_apk': {
'swarming': {
'shards': 5,
},
'args': [
'--enable-features=NetworkService',
],
'test': 'content_shell_test_apk',
},
},
'network_service_chromeos_fyi_gtests': { 'network_service_chromeos_fyi_gtests': {
'network_service_browser_tests': { 'network_service_browser_tests': {
'args': [ 'args': [
...@@ -2628,6 +2631,7 @@ ...@@ -2628,6 +2631,7 @@
'chromium_gtests_for_devices_with_graphical_output', 'chromium_gtests_for_devices_with_graphical_output',
'linux_flavor_specific_chromium_gtests', 'linux_flavor_specific_chromium_gtests',
'vr_platform_specific_chromium_gtests', 'vr_platform_specific_chromium_gtests',
'network_service_android_gtests',
], ],
'chromium_dbg_isolated_scripts': [ 'chromium_dbg_isolated_scripts': [
...@@ -3076,6 +3080,7 @@ ...@@ -3076,6 +3080,7 @@
], ],
'mojo_android_gtests': [ 'mojo_android_gtests': [
'network_service_android_fyi_gtests',
'network_service_android_gtests', 'network_service_android_gtests',
'non_viz_fyi_chromium_gtests', 'non_viz_fyi_chromium_gtests',
'viz_gtests', 'viz_gtests',
......
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