Commit 4d96cb89 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Reduce test suites on android P CQ bot to what can fit in the test pool.

As outlined in https://bugs.chromium.org/p/chromium/issues/detail?id=1111436#c17

Bug: 1111436
Change-Id: I8e652b731de9de83bbde1a0acb54e5bf3093519f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2349928
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: default avatarHaiyang Pan <hypan@google.com>
Reviewed-by: default avatarErik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807251}
parent 9369dc9b
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
# crbug/1036413
# crbug.com/1036413
-org.chromium.chrome.browser.banners.AppBannerManagerTest.testBlockedAmbientBadgeDoesNotAppearAgainForMonths
# crbug/1036417
# crbug.com/1036417
-org.chromium.chrome.browser.dom_distiller.DistilledPagePrefsTest.testSingleObserverFontFamily
-org.chromium.chrome.browser.dom_distiller.DistilledPagePrefsTest.testSingleObserverFontScaling
-org.chromium.chrome.browser.dom_distiller.DistilledPagePrefsTest.testSingleObserverTheme
# crbug/963898
# crbug.com/963898
-org.chromium.chrome.browser.download.DownloadMediaParserTest.testParseVideoH264
# crbug/1018181
# crbug.com/1018181
-org.chromium.chrome.browser.download.home.DownloadActivityV2Test.testLaunchingActivity
# crbug/1032118
# crbug.com/1032118
-org.chromium.chrome.browser.notifications.channels.ChannelsInitializerTest.testEnsureInitialized_permissionRequests
-org.chromium.chrome.browser.notifications.channels.ChannelsInitializerTest.testEnsureInitialized_permissionRequestsHigh
-org.chromium.chrome.browser.notifications.StandardNotificationBuilderTest.testSetAll
# crbug/1036459
# crbug.com/1036459
-org.chromium.chrome.browser.ntp.cards.NewTabPageRecyclerViewTest.testDismissArticleWithContextMenu
-org.chromium.chrome.browser.ntp.NewTabPageTest.testFocusFakebox
-org.chromium.chrome.browser.ntp.NewTabPageTest.testOpenMostVisitedItemInIncognitoTab
-org.chromium.chrome.browser.ntp.NewTabPageTest.testRemoveMostVisitedItem
-org.chromium.chrome.browser.ntp.RecentTabsPageTest.testRecentlyClosedTabs
# crbug/1040088
# crbug.com/1040088
-org.chromium.chrome.browser.payments.PaymentRequestRetryTest.testRetryWithShippingAddressErrorsAndPayerErrors
# crbug/707528
# crbug.com/707528
-org.chromium.chrome.browser.push_messaging.PushMessagingTest.testPushAndShowNotification
# crbug/836460
# crbug.com/836460
-org.chromium.chrome.browser.autofill.settings.AutofillProfilesFragmentTest.testKeyboardShownOnDpadCenter
# crbug/1036545
# crbug.com/1036545
-org.chromium.chrome.browser.suggestions.tile.TileGroupTest.testDismissTileUndo
-org.chromium.chrome.browser.suggestions.tile.TileGroupTest.testDismissTileWithContextMenu
# crbug/1036552
# crbug.com/1036552
-org.chromium.chrome.browser.tasks.tab_management.TabGridDialogViewTest.testDialog_ZoomInFadeOut
-org.chromium.chrome.browser.tasks.tab_management.TabGridDialogViewTest.testDialog_ZoomInZoomOut
# crbug/1036553
# crbug.com/1036553
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTabMenuDismissedOnOrientationChange
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarAppears
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarOverflowMenus
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarReopenOnTarget
# crbug/1036556
# crbug.com/1036556
-org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testMediaSuspension
-org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testMultiWindow
-org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testTabAddedFromCustomTab
......@@ -61,7 +61,7 @@
-org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testTabSwitchBackToSuspended
-org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testTabUnsuspendedInBackground
# crbug/1036571
# crbug.com/1036571
-org.chromium.shape_detection.BarcodeDetectionImplTest.testDetectBarcodeWithHint
-org.chromium.shape_detection.BarcodeDetectionImplTest.testDetectBarcodeWithoutHint
-org.chromium.shape_detection.FaceDetectionImplTest.testDetectFacesInProfileWithGmsCore
......@@ -71,9 +71,24 @@
-org.chromium.chrome.browser.shape_detection.ShapeDetectionTest.testBarcodeDetection
-org.chromium.chrome.browser.shape_detection.ShapeDetectionTest.testTextDetection
# crbug/1034412
# crbug.com/1034412
-org.chromium.chrome.browser.media.ui.PictureInPictureControllerTest.testEnterPip
-org.chromium.chrome.browser.media.ui.PictureInPictureControllerTest.testReenterPip
# crbug/1039522
# crbug.com/1039522
-org.chromium.chrome.browser.settings.privacy.BrowsingDataBridgeTest.testClearingSiteSettingsAndCacheWithImportantSites
# crbug.com/1128480
-org.chromium.chrome.browser.reengagement.ReengagementNotificationControllerIntegrationTest.testEngagementNotTrackedDueToIntentOpeningTab
-org.chromium.chrome.browser.reengagement.ReengagementNotificationControllerIntegrationTest.testEngagementTracked
-org.chromium.chrome.browser.reengagement.ReengagementNotificationControllerIntegrationTest.testReengagementActivity
# crbug.com/1128488
-org.chromium.chrome.browser.tasks.tab_management.TabGridDialogTest.testDialogInitialShowFromStrip
# crbug.com/1128570
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testManualInitiationWithBarOpen
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testStartTranslateOnManualInitiation
# crbug.com/1128665
-org.chromium.chrome.browser.download.DownloadTest.testDuplicateHttpPostDownload_Cancel__UseDownloadOfflineContentProviderEnabled
......@@ -685,8 +685,6 @@
'android-asan', # https://crbug.com/964562
'android-code-coverage-native', # https://crbug.com/1018780
'android-lollipop-arm-rel', # https://crbug.com/1060245
# TODO https://crbug.com/1109999: Re-enable once there are enough devices
'android-pie-arm64-rel',
'android-pie-x86-rel', # crbug.com/1126536
],
'modifications': {
......@@ -749,6 +747,15 @@
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64_rel.chrome_public_test_apk.filter', # https://crbug.com/1010211
],
# TODO(crbug.com/1111436): Move this back to walleye if/when additional
# capacity has been deployed.
'swarming': {
'dimension_sets': [
{
'device_type': 'sailfish',
},
],
}
},
'android-pie-x86-rel': {
'args': [
......
......@@ -165,6 +165,30 @@
'chrome_java_test_pagecontroller_tests': {},
},
# TODO(crbug.com/1111436): Deprecate this group in favor of
# android_pie_rel_non_skia_renderer_gtests if/when android Pie capacity
# is fully restored.
'android_pie_rel_reduced_capacity_gtests': {
'chrome_public_test_apk': {
'swarming': {
'shards': 20,
},
'mixins': [
'chrome-gold-service-account',
'skia_gold_test',
],
},
'monochrome_public_bundle_fake_modules_smoke_test': {},
'monochrome_public_bundle_smoke_test': {},
'monochrome_public_smoke_test': {},
'weblayer_instrumentation_test_apk': {},
'webview_instrumentation_test_apk': {
'swarming': {
'shards': 7,
},
},
},
'android_smoke_tests': {
'chrome_public_smoke_test': {},
},
......@@ -4623,25 +4647,25 @@
#
# TODO(https://crbug.com/1058067): Remove this once SkiaRenderer goes
# stable on Android.
'android_pie_rel_non_skia_renderer_gtests': [
'android_monochrome_smoke_tests',
'android_pagecontroller_self_tests',
'android_smoke_tests',
# TODO: Following tests are experimental (crbug/1010211).
'android_specific_chromium_gtests', # Already includes gl_gtests.
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'linux_flavor_specific_chromium_gtests',
'network_service_android_gtests',
'non_skia_renderer_gtests',
'system_webview_shell_instrumentation_tests', # Not an experimental test
'vr_platform_specific_chromium_gtests',
'weblayer_android_gtests',
'weblayer_gtests',
# Experimental tests end here.
'webview_cts_tests_gtest',
'webview_ui_instrumentation_tests',
],
# 'android_pie_rel_non_skia_renderer_gtests': [
# 'android_monochrome_smoke_tests',
# 'android_pagecontroller_self_tests',
# 'android_smoke_tests',
# # TODO: Following tests are experimental (crbug/1010211).
# 'android_specific_chromium_gtests', # Already includes gl_gtests.
# 'chromium_gtests',
# 'chromium_gtests_for_devices_with_graphical_output',
# 'linux_flavor_specific_chromium_gtests',
# 'network_service_android_gtests',
# 'non_skia_renderer_gtests',
# 'system_webview_shell_instrumentation_tests', # Not an experimental test
# 'vr_platform_specific_chromium_gtests',
# 'weblayer_android_gtests',
# 'weblayer_gtests',
# # Experimental tests end here.
# 'webview_cts_tests_gtest',
# 'webview_ui_instrumentation_tests',
# ],
'android_wpt_scripts': [
'chrome_public_wpt',
......
......@@ -868,8 +868,11 @@
'weblayer_shell',
],
'test_suites': {
'gtest_tests': 'android_pie_rel_non_skia_renderer_gtests',
'isolated_scripts': 'marshmallow_nougat_pie_isolated_scripts_with_proguard',
#'gtest_tests': 'android_pie_rel_non_skia_renderer_gtests',
#'isolated_scripts': 'marshmallow_nougat_pie_isolated_scripts_with_proguard',
# TODO(crbug.com/1111436): Remove this if/when additional capacity
# has been deployed.
'gtest_tests': 'android_pie_rel_reduced_capacity_gtests',
},
'use_swarming': True,
'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