Skip to content

GitLab

T
tangled
Commit aa24223a authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot
Browse files
Options

emulator: balance test suites between FYI and non-FYI MM builders 

Bug: 1098111, 997376
Change-Id: Ie7a98821799cb45e0db94cd4e1aa61fb064066b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261693Reviewed-by: default avatarYuke Liao <liaoyuke@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#782012}
parent 3ff9b537
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4291 additions and 4202 deletions
testing/buildbot/chromium.android.fyi.json
View file @ aa24223a
This source diff could not be displayed because it is too large. You can view the blob instead.
testing/buildbot/chromium.android.json
View file @ aa24223a
This source diff could not be displayed because it is too large. You can view the blob instead.
testing/buildbot/chromium.ci.json
View file @ aa24223a
This diff is collapsed.
testing/buildbot/test_suite_exceptions.pyl
View file @ aa24223a
......@@ -629,7 +629,7 @@
'shards': 3,
},
},
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
# https://crbug.com/1039860
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.cc_unittests.filter',
......@@ -668,6 +668,7 @@
'android-asan', # https://crbug.com/964562
'android-code-coverage-native', # https://crbug.com/1018780
'android-lollipop-arm-rel', # https://crbug.com/1060245
'android-marshmallow-x86-rel', # crbug.com/1098111
],
'modifications': {
'Android CFI': {
......@@ -748,7 +749,7 @@
'remove_from': [
'Lollipop Tablet Tester',
'Marshmallow Tablet Tester',
'android-marshmallow-x86-fyi-rel',
'android-marshmallow-x86-rel',
'android-pie-x86-rel',
'android-pie-arm64-rel', # https://crbug.com/1010211
'ToTAndroid',
......@@ -825,6 +826,7 @@
'android-code-coverage-native', # crbug/1018434
# http://crbug.com/1060245#c30: due to low utility and capacity.
'android-marshmallow-arm64-rel',
'android-marshmallow-x86-rel', # crbug.com/1098111
],
'modifications': {
'Cast Audio Linux': {
......@@ -955,7 +957,7 @@
},
'content_shell_crash_test': {
'remove_from': [
'android-marshmallow-x86-fyi-rel', # crbug.com/1084353
'android-marshmallow-x86-rel', # crbug.com/1084353
],
'modifications': {
'Win10 Tests x64 (dbg)': {
......@@ -969,7 +971,7 @@
'android-code-coverage-native', # crbug/1018434
],
'modifications': {
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.content_shell_test_apk.filter',
],
......@@ -1216,7 +1218,7 @@
],
},
},
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.gl_tests.filter',
],
......@@ -1464,7 +1466,7 @@
},
'media_unittests': {
'modifications': {
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.media_unittests.filter',
],
......@@ -1649,7 +1651,7 @@
'shards': 4,
}
},
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
# crbug.com/1046060
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.net_unittests.filter',
......@@ -1819,6 +1821,7 @@
'Lollipop Tablet Tester',
'Marshmallow Tablet Tester',
'android-code-coverage-native', # https://crbug.com/1018780
'android-marshmallow-x86-rel', # crbug.com/1098111
],
'modifications': {
'Android CFI': {
......@@ -1878,6 +1881,7 @@
'Lollipop Tablet Tester',
'Marshmallow Tablet Tester',
'android-code-coverage-native', # crbug/1018434
'android-marshmallow-x86-rel', # crbug.com/1098111
],
'modifications': {
'android-marshmallow-x86-fyi-rel': {
......@@ -1912,7 +1916,7 @@
'android-code-coverage-native', # crbug/1018434
],
'modifications': {
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.content_shell_test_apk.filter',
],
......@@ -1925,8 +1929,8 @@
},
},
'network_service_webview_instrumentation_test_apk': {
# Only run these on the phone testers for now due to capacity.
'remove_from': [
# Only run these on the phone testers for now due to capacity.
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-pie-arm64-rel',
......@@ -1937,6 +1941,7 @@
'ToTAndroid',
'ToTAndroidCFI',
'android-code-coverage-native', # https://crbug.com/1018431
'android-marshmallow-x86-rel', # crbug.com/1098111
],
'modifications': {
'android-pie-x86-rel': {
......@@ -2014,7 +2019,7 @@
'android-code-coverage-native',
'android-lollipop-arm-rel',
'android-marshmallow-arm64-rel',
'android-marshmallow-x86-fyi-rel',
'android-marshmallow-x86-rel',
'android-pie-arm64-rel',
'android-pie-x86-rel',
'Android CFI',
......@@ -2159,7 +2164,7 @@
'--shard-timeout=300',
],
},
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.sandbox_linux_unittests.filter',
]
......@@ -2284,14 +2289,14 @@
},
'telemetry_chromium_minidump_unittests': {
'remove_from': [
'android-marshmallow-x86-fyi-rel', # crbug.com/1084352
'android-marshmallow-x86-rel', # crbug.com/1084352
],
},
'telemetry_monochrome_minidump_unittests': {
'remove_from': [
# Monochrome isn't supported on M.
'android-marshmallow-arm64-rel',
'android-marshmallow-x86-fyi-rel',
'android-marshmallow-x86-rel',
],
},
'telemetry_perf_unittests': {
......@@ -2347,7 +2352,7 @@
},
},
'remove_from': [
'android-marshmallow-x86-fyi-rel', # crbug.com/1084352
'android-marshmallow-x86-rel', # crbug.com/1084352
# There's no need to run telemetry_perf_unittests on both lollipop and
# marshmallow on the CQ. https://crbug.com/1026487.
'android-marshmallow-arm64-rel',
......@@ -2494,7 +2499,7 @@
},
'viz_unittests': {
'modifications': {
'android-marshmallow-x86-fyi-rel': {
'android-marshmallow-x86-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.viz_unittests.filter',
],
......@@ -2508,21 +2513,21 @@
},
'vr_android_unittests': {
'remove_from': [
'android-marshmallow-x86-fyi-rel',
'android-marshmallow-x86-rel',
'android-pie-x86-rel',
'android-code-coverage-native', # crbug/1018434
],
},
'vr_common_unittests': {
'remove_from': [
'android-marshmallow-x86-fyi-rel',
'android-marshmallow-x86-rel',
'android-pie-x86-rel',
'android-code-coverage-native', # crbug/1018431
],
},
'vr_pixeltests': {
'remove_from': [
'android-marshmallow-x86-fyi-rel',
'android-marshmallow-x86-rel',
'android-pie-x86-rel',
'VR Linux',
'android-code-coverage-native', # crbug/1018431
......@@ -2650,12 +2655,12 @@
},
'weblayer_bundle_test': {
'remove_from': [
'android-marshmallow-x86-fyi-rel', # crbug.com/1088013
'android-marshmallow-x86-rel', # crbug.com/1088013
],
},
'weblayer_instrumentation_test_apk': {
'remove_from': [
'android-marshmallow-x86-fyi-rel', # crbug.com/1088013
'android-marshmallow-x86-rel', # crbug.com/1088013
],
},
'webview_instrumentation_test_apk': {
......@@ -2669,6 +2674,7 @@
# from android-marshmallow-arm64-rel-swarming).
'android-lollipop-arm-rel-swarming',
'android-code-coverage-native', # https://crbug.com/1018431
'android-marshmallow-x86-rel', # crbug.com/1098111
],
'modifications': {
# chromium.android.fyi
......
testing/buildbot/test_suites.pyl
View file @ aa24223a
......@@ -91,6 +91,70 @@
},
},
# List gtests that are removed in marshmallow emulator builder due to:
# - GCE capacity limitation
# - or timeout issue (crbug.com/1093602)
# They will be run in a marshmallow emulator FYI builder to keep test
# coverage or debug the timeout issue.
'android_marshmallow_emulator_backlog_gtests': {
'chrome_public_test_apk': {
'swarming': {
'shards': 20,
},
'mixins': [
'chrome-gold-service-account',
'skia_gold_test',
],
},
'content_browsertests': {
'android_swarming': {
'shards': 9,
},
'swarming': {
'shards': 6,
},
},
'network_service_out_of_process_chrome_public_test_apk': {
'swarming': {
'shards': 20,
},
'args': [
'--disable-features=NetworkServiceInProcess',
],
'mixins': [
'chrome-gold-service-account',
'skia_gold_test',
],
'test': 'chrome_public_test_apk',
},
'network_service_out_of_process_content_browsertests': {
'args': [
'--disable-features=NetworkServiceInProcess',
],
'swarming': {
'shards': 5,
},
'test': 'content_browsertests',
},
'network_service_webview_instrumentation_test_apk': {
'swarming': {
'shards': 20,
},
'args': [
# TODO(crbug.com/882650): WebView currently does not support running network
# service OOP.
'--enable-features=NetworkService,NetworkServiceInProcess',
'--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_webview_instrumentation_test_apk.filter',
],
'test': 'webview_instrumentation_test_apk',
},
'webview_instrumentation_test_apk': {
'swarming': {
'shards': 7,
},
},
},
'android_modern_smoke_tests': {
'chrome_modern_public_bundle_fake_modules_smoke_test': {},
'chrome_modern_public_bundle_smoke_test': {},
......
testing/buildbot/waterfalls.pyl
View file @ aa24223a
......@@ -691,6 +691,18 @@
},
'os_type': 'android',
},
'android-marshmallow-x86-rel': {
'mixins': [
'marshmallow-x86-emulator',
'linux-xenial',
'x86-64',
],
'os_type': 'android',
'test_suites': {
'gtest_tests': 'android_lollipop_marshmallow_gtests',
'isolated_scripts': 'marshmallow_pie_isolated_scripts_with_proguard',
}
},
'android-pie-arm64-dbg': {
'mixins': [
'pie_fleet',
......@@ -793,8 +805,7 @@
],
'os_type': 'android',
'test_suites': {
'gtest_tests': 'android_lollipop_marshmallow_gtests',
'isolated_scripts': 'marshmallow_pie_isolated_scripts_with_proguard',
'gtest_tests': 'android_marshmallow_emulator_backlog_gtests',
}
},
'android-weblayer-pie-x86-fyi-rel': {
......
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