Skip to content

GitLab

T
tangled
Commit fabfb073 authored by John Abd-El-Malek's avatar John Abd-El-Malek
Browse files
Options

Don't run integration tests with out of process network service on Android trybots. 

Waterfall should be enough because we expect failures that are specific to this config to be rare. We also don't want to run the tests twice on the CQ for capacity reasons.

Bug: 953463
Change-Id: I2d2e217512e4d2d3d181ff5eda0f7caec403af6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636222
Auto-Submit: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: default avatarChris Mumford <cmumford@google.com>
Cr-Commit-Position: refs/heads/master@{#664884}
parent 83be4f7d
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 376 deletions
testing/buildbot/chromium.android.json
View file @ fabfb073
...@@ -21086,54 +21086,6 @@ ...@@ -21086,54 +21086,6 @@
}, },
"test": "chrome_public_test_apk" "test": "chrome_public_test_apk"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gtest_filter=-org.chromium.chrome.browser.FeaturesAnnotationsTest#testFeaturesSetExistingFlags",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_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": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"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",
...@@ -21225,52 +21177,6 @@ ...@@ -21225,52 +21177,6 @@
}, },
"test": "components_browsertests" "test": "components_browsertests"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_components_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_components_browsertests",
"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": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"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"
}
]
},
"test": "components_browsertests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -21361,53 +21267,6 @@ ...@@ -21361,53 +21267,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_content_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_content_browsertests",
"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": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"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_browsertests"
},
{ {
"args": [ "args": [
"--disable-perfetto", "--disable-perfetto",
...@@ -21500,53 +21359,6 @@ ...@@ -21500,53 +21359,6 @@
}, },
"test": "content_shell_test_apk" "test": "content_shell_test_apk"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_content_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_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": "KTU84P",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"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",
...@@ -24068,54 +23880,6 @@ ...@@ -24068,54 +23880,6 @@
}, },
"test": "chrome_public_test_apk" "test": "chrome_public_test_apk"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gtest_filter=-org.chromium.chrome.browser.FeaturesAnnotationsTest#testFeaturesSetExistingFlags",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_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_os_type": "userdebug",
"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",
...@@ -24207,52 +23971,6 @@ ...@@ -24207,52 +23971,6 @@
}, },
"test": "components_browsertests" "test": "components_browsertests"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_components_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_components_browsertests",
"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_os_type": "userdebug",
"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"
}
]
},
"test": "components_browsertests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -24343,53 +24061,6 @@ ...@@ -24343,53 +24061,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_content_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_content_browsertests",
"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_os_type": "userdebug",
"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_browsertests"
},
{ {
"args": [ "args": [
"--disable-perfetto", "--disable-perfetto",
...@@ -24482,53 +24153,6 @@ ...@@ -24482,53 +24153,6 @@
}, },
"test": "content_shell_test_apk" "test": "content_shell_test_apk"
}, },
{
"args": [
"--disable-features=NetworkServiceInProcess",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"network_service_out_of_process_content_shell_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "network_service_out_of_process_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_os_type": "userdebug",
"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 @ fabfb073
...@@ -1025,6 +1025,34 @@ ...@@ -1025,6 +1025,34 @@
}, },
}, },
}, },
'network_service_out_of_process_chrome_public_test_apk': {
# Don't run on trybots; waterfall is enough.
'remove_from': [
'android-kitkat-arm-rel',
'android-marshmallow-arm64-rel'
],
},
'network_service_out_of_process_components_browsertests': {
# Don't run on trybots; waterfall is enough.
'remove_from': [
'android-kitkat-arm-rel',
'android-marshmallow-arm64-rel'
],
},
'network_service_out_of_process_content_browsertests': {
# Don't run on trybots; waterfall is enough.
'remove_from': [
'android-kitkat-arm-rel',
'android-marshmallow-arm64-rel'
],
},
'network_service_out_of_process_content_shell_test_apk': {
# Don't run on trybots; waterfall is enough.
'remove_from': [
'android-kitkat-arm-rel',
'android-marshmallow-arm64-rel'
],
},
'network_service_webview_instrumentation_test_apk': { 'network_service_webview_instrumentation_test_apk': {
# Only run these on the phone testers for now due to capacity. # Only run these on the phone testers for now due to capacity.
'remove_from': [ 'remove_from': [
......
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