Skip to content

GitLab

T
tangled
Commit 0225fb6c authored by Haiyang Pan's avatar Haiyang Pan Committed by Chromium LUCI CQ
Browse files
Options

Run more test suites on android-pie-arm64-rel experimentally 

* chrome_public_test_apk at 50%
* chrome_public_smoke_test at 100%
* weblayer_unittests at 100%
* webview_ui_test_app_test_apk at 100%

Since now there are about 800 (http://shortn/_JqmfiRDZkq) test devices
in the pool which is even more than the amount before
the outage (690, http://shortn/_ABaTS4EnNU), we can add the test suites
more aggressively.

Also re-organize the compound test suite for android-pie-arm64-rel
to make it easier to re-enable test suites.

Bug: 1111436
Change-Id: I456046376d76c1632a74fdfc68862b234c741132
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611650Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#841629}
parent 7701ab72
Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 33 deletions
testing/buildbot/chromium.android.json
View file @ 0225fb6c
...@@ -41668,6 +41668,116 @@ ...@@ -41668,6 +41668,116 @@
"test": "chrome_java_test_webapk_launch_tests", "test": "chrome_java_test_webapk_launch_tests",
"test_id_prefix": "ninja://chrome/test/android:chrome_java_test_webapk_launch_tests/" "test_id_prefix": "ninja://chrome/test/android:chrome_java_test_webapk_launch_tests/"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"experiment_percentage": 100,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"chrome_public_smoke_test"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true
},
"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": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_public_smoke_test",
"test_id_prefix": "ninja://chrome/android:chrome_public_smoke_test/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
"--git-revision=${got_revision}",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64_rel.chrome_public_test_apk.filter"
],
"experiment_percentage": 50,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"chrome_public_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"precommit_args": [
"--gerrit-issue=${patch_issue}",
"--gerrit-patchset=${patch_set}",
"--buildbucket-id=${buildbucket_build_id}"
],
"resultdb": {
"enable": true
},
"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": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"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"
}
],
"service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
"shards": 20
},
"test": "chrome_public_test_apk",
"test_id_prefix": "ninja://chrome/android:chrome_public_test_apk/"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -41969,6 +42079,57 @@ ...@@ -41969,6 +42079,57 @@
"test": "weblayer_instrumentation_test_apk", "test": "weblayer_instrumentation_test_apk",
"test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_apk/" "test_id_prefix": "ninja://weblayer/browser/android/javatests:weblayer_instrumentation_test_apk/"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"experiment_percentage": 100,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"weblayer_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true
},
"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": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "weblayer_unittests",
"test_id_prefix": "ninja://weblayer/test:weblayer_unittests/"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -42075,6 +42236,57 @@ ...@@ -42075,6 +42236,57 @@
}, },
"test": "webview_instrumentation_test_apk", "test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/" "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
},
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"experiment_percentage": 100,
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"webview_ui_test_app_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"resultdb": {
"enable": true
},
"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": "PQ3A.190801.002",
"device_os_flavor": "google",
"device_os_type": "userdebug",
"device_type": "walleye",
"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"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "webview_ui_test_app_test_apk",
"test_id_prefix": "ninja://android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk/"
} }
] ]
}, },
testing/buildbot/test_suite_exceptions.pyl
View file @ 0225fb6c
...@@ -729,6 +729,12 @@ ...@@ -729,6 +729,12 @@
'remove_from': [ 'remove_from': [
'android-code-coverage-native', # https://crbug.com/1018780 'android-code-coverage-native', # https://crbug.com/1018780
], ],
# TODO(crbug.com/1111436): Remove experimental when it works fine.
'modifications': {
'android-pie-arm64-rel': {
'experiment_percentage': 100,
},
},
}, },
'chrome_public_test_apk': { 'chrome_public_test_apk': {
'remove_from': [ 'remove_from': [
...@@ -788,6 +794,8 @@ ...@@ -788,6 +794,8 @@
'args': [ 'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64_rel.chrome_public_test_apk.filter', # https://crbug.com/1010211 '--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64_rel.chrome_public_test_apk.filter', # https://crbug.com/1010211
], ],
# TODO(crbug.com/1111436): Remove experimental when it works fine.
'experiment_percentage': 50,
}, },
'android-pie-x86-rel': { 'android-pie-x86-rel': {
'args': [ 'args': [
...@@ -2927,6 +2935,14 @@ ...@@ -2927,6 +2935,14 @@
}, },
}, },
}, },
# TODO(crbug.com/1111436): Remove this once it works fine.
'weblayer_unittests': {
'modifications': {
'android-pie-arm64-rel': {
'experiment_percentage': 100,
},
},
},
'webview_cts_tests': { 'webview_cts_tests': {
'modifications': { 'modifications': {
'android-pie-arm64-rel': { 'android-pie-arm64-rel': {
...@@ -2977,6 +2993,14 @@ ...@@ -2977,6 +2993,14 @@
}, },
}, },
}, },
# TODO(crbug.com/1111436): Remove this once it works fine.
'webview_ui_test_app_test_apk': {
'modifications': {
'android-pie-arm64-rel': {
'experiment_percentage': 100,
},
},
},
'xr_browser_tests': { 'xr_browser_tests': {
'remove_from': [ 'remove_from': [
# This exception probably needs to stay due to lack of capacity # This exception probably needs to stay due to lack of capacity
......
testing/buildbot/test_suites.pyl
View file @ 0225fb6c
...@@ -151,30 +151,22 @@ ...@@ -151,30 +151,22 @@
'android_pie_rel_reduced_capacity_gtests': { 'android_pie_rel_reduced_capacity_gtests': {
'android_browsertests': {}, 'android_browsertests': {},
'blink_platform_unittests': {}, 'blink_platform_unittests': {},
'chrome_java_test_pagecontroller_tests': {}, 'chrome_public_test_apk': {
'chrome_java_test_webapk_launch_tests': {},
'content_browsertests': {
'swarming': { 'swarming': {
'shards': 15, 'shards': 20,
}, },
'mixins': [
'chrome-gold-service-account',
'skia_gold_test',
'enable_resultdb',
],
}, },
'monochrome_public_bundle_fake_modules_smoke_test': {}, 'content_browsertests': {
'monochrome_public_bundle_smoke_test': {},
'monochrome_public_smoke_test': {},
'weblayer_browsertests': {},
'weblayer_instrumentation_test_apk': {},
'webview_cts_tests': {
'swarming': { 'swarming': {
'shards': 2, 'shards': 15,
'cipd_packages': [
{
"cipd_package": 'chromium/android_webview/tools/cts_archive',
'location': 'android_webview/tools/cts_archive',
'revision': 'ai8Ig4HlO0vG6aP_JP2uhyruE2yPzze8PFP1g8Z4_hgC',
}
]
}, },
}, },
'weblayer_instrumentation_test_apk': {},
'webview_instrumentation_test_apk': { 'webview_instrumentation_test_apk': {
'swarming': { 'swarming': {
'shards': 7, 'shards': 7,
...@@ -5273,12 +5265,16 @@ ...@@ -5273,12 +5265,16 @@
# #
# TODO(https://crbug.com/1058067): Remove this once SkiaRenderer goes # TODO(https://crbug.com/1058067): Remove this once SkiaRenderer goes
# stable on Android. # stable on Android.
# 'android_pie_rel_non_skia_renderer_gtests': [ 'android_pie_rel_non_skia_renderer_gtests': [
# 'android_monochrome_smoke_tests', # TODO(crbug.com/1111436): Deprecate this when all the test suites below
# 'android_pagecontroller_self_tests', # it are re-enabled.
# 'android_smoke_tests', 'android_pie_rel_reduced_capacity_gtests',
# 'android_webapk_launch_tests',
# # TODO: Following tests are experimental (crbug/1010211). 'android_monochrome_smoke_tests',
'android_pagecontroller_self_tests',
'android_smoke_tests',
'android_webapk_launch_tests',
# TODO: Following tests are experimental (crbug/1010211).
# 'android_specific_chromium_gtests', # Already includes gl_gtests. # 'android_specific_chromium_gtests', # Already includes gl_gtests.
# 'chromium_gtests', # 'chromium_gtests',
# 'chromium_gtests_for_devices_with_graphical_output', # 'chromium_gtests_for_devices_with_graphical_output',
...@@ -5288,11 +5284,11 @@ ...@@ -5288,11 +5284,11 @@
# 'system_webview_shell_instrumentation_tests', # Not an experimental test # 'system_webview_shell_instrumentation_tests', # Not an experimental test
# 'vr_platform_specific_chromium_gtests', # 'vr_platform_specific_chromium_gtests',
# 'weblayer_android_gtests', # 'weblayer_android_gtests',
# 'weblayer_gtests', 'weblayer_gtests',
# # Experimental tests end here. # Experimental tests end here.
# 'webview_cts_tests_gtest', 'webview_cts_tests_gtest',
# 'webview_ui_instrumentation_tests', 'webview_ui_instrumentation_tests',
# ], ],
'android_wpt_scripts': [ 'android_wpt_scripts': [
'chrome_public_wpt', 'chrome_public_wpt',
......
testing/buildbot/waterfalls.pyl
View file @ 0225fb6c
...@@ -1125,11 +1125,10 @@ ...@@ -1125,11 +1125,10 @@
'weblayer_shell', 'weblayer_shell',
], ],
'test_suites': { 'test_suites': {
#'gtest_tests': 'android_pie_rel_non_skia_renderer_gtests', 'gtest_tests': 'android_pie_rel_non_skia_renderer_gtests',
#'isolated_scripts': 'marshmallow_nougat_pie_isolated_scripts_with_proguard', # TODO(crbug.com/1111436): Re-enable this if/when additional capacity
# TODO(crbug.com/1111436): Remove this if/when additional capacity
# has been deployed. # has been deployed.
'gtest_tests': 'android_pie_rel_reduced_capacity_gtests', #'isolated_scripts': 'marshmallow_nougat_pie_isolated_scripts_with_proguard',
}, },
'use_swarming': True, 'use_swarming': True,
'os_type': 'android', 'os_type': 'android',
......
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