Run webview_instrumentation_test_apk only in multiprocess in Android R+
This is part of the proposal to remove unnecessary process mode tests
in chromium infra. The change is achieved by splitting the current
webview_instrumentation_test_apk into 2 new suite definitions. Android
Q & below still runs both single and multiple process mode, in
`webview_instrumentation_test_apk_single_process_mode` and
`webview_instrumentation_test_apk_multiple_process_mode` suites.
Bug: b:340651691
Change-Id: I6c43992a2ca0ce4c7199af5ee7d3b95b8374af3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5767113
Reviewed-by: Haiyang Pan <hypan@google.com>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1339192}
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl
index c5b7b18..984fe5d2 100644
--- a/infra/config/generated/testing/test_suites.pyl
+++ b/infra/config/generated/testing/test_suites.pyl
@@ -97,9 +97,13 @@
'shards': 20,
},
},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 9,
+ 'shards': 6,
},
},
},
@@ -123,9 +127,13 @@
},
},
'viz_unittests': {},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 7,
+ 'shards': 5,
},
},
},
@@ -163,9 +171,13 @@
'gl_unittests': {},
'mojo_test_apk': {},
'ui_android_unittests': {},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 7,
+ 'shards': 5,
},
},
},
@@ -177,9 +189,22 @@
},
},
'mojo_test_apk': {},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 7,
+ 'shards': 5,
+ },
+ },
+ 'webview_instrumentation_test_apk_single_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=single',
+ ],
+ 'swarming': {
+ 'shards': 3,
},
},
},
@@ -5513,6 +5538,18 @@
},
},
+ 'webview_instrumentation_test_apk_single_process_mode_gtests': {
+ 'webview_instrumentation_test_apk_single_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=single',
+ ],
+ 'swarming': {
+ 'shards': 3,
+ },
+ },
+ },
+
'webview_trichrome_64_cts_field_trial_tests': {
'webview_trichrome_64_cts_tests': {
'mixins': [
@@ -5739,6 +5776,7 @@
'linux_flavor_specific_chromium_gtests',
'vr_android_specific_chromium_tests',
'vr_platform_specific_chromium_gtests',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
],
'android_oreo_emulator_gtests': [
@@ -5753,6 +5791,7 @@
'linux_flavor_specific_chromium_gtests',
'system_webview_shell_instrumentation_tests',
'webview_cts_tests_gtest',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
'webview_ui_instrumentation_tests',
],
@@ -5774,6 +5813,7 @@
'linux_flavor_specific_chromium_gtests',
'system_webview_shell_instrumentation_tests',
'webview_cts_tests_gtest',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
'webview_ui_instrumentation_tests',
],
@@ -5784,6 +5824,7 @@
'chrome_public_tests',
'system_webview_shell_instrumentation_tests',
'webview_64_cts_tests_gtest',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
'webview_ui_instrumentation_tests',
],
@@ -5849,6 +5890,7 @@
'linux_flavor_specific_chromium_gtests',
'vr_android_specific_chromium_tests',
'vr_platform_specific_chromium_gtests',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
],
'chromium_dbg_isolated_scripts': [
diff --git a/infra/config/targets/basic_suites.star b/infra/config/targets/basic_suites.star
index 54aa28d..d487fe6d2 100644
--- a/infra/config/targets/basic_suites.star
+++ b/infra/config/targets/basic_suites.star
@@ -100,9 +100,9 @@
shards = 20,
),
),
- "webview_instrumentation_test_apk": targets.legacy_test_config(
+ "webview_instrumentation_test_apk_multiple_process_mode": targets.legacy_test_config(
swarming = targets.swarming(
- shards = 9,
+ shards = 6,
),
),
},
@@ -130,9 +130,9 @@
),
),
"viz_unittests": targets.legacy_test_config(),
- "webview_instrumentation_test_apk": targets.legacy_test_config(
+ "webview_instrumentation_test_apk_multiple_process_mode": targets.legacy_test_config(
swarming = targets.swarming(
- shards = 7,
+ shards = 5,
),
),
},
@@ -179,9 +179,9 @@
"gl_unittests": targets.legacy_test_config(),
"mojo_test_apk": targets.legacy_test_config(),
"ui_android_unittests": targets.legacy_test_config(),
- "webview_instrumentation_test_apk": targets.legacy_test_config(
+ "webview_instrumentation_test_apk_multiple_process_mode": targets.legacy_test_config(
swarming = targets.swarming(
- shards = 7,
+ shards = 5,
),
),
},
@@ -196,9 +196,14 @@
),
),
"mojo_test_apk": targets.legacy_test_config(),
- "webview_instrumentation_test_apk": targets.legacy_test_config(
+ "webview_instrumentation_test_apk_multiple_process_mode": targets.legacy_test_config(
swarming = targets.swarming(
- shards = 7,
+ shards = 5,
+ ),
+ ),
+ "webview_instrumentation_test_apk_single_process_mode": targets.legacy_test_config(
+ swarming = targets.swarming(
+ shards = 3,
),
),
},
@@ -5325,6 +5330,18 @@
},
)
+# This target is only to run on Android versions <= Android Q (10).
+targets.legacy_basic_suite(
+ name = "webview_instrumentation_test_apk_single_process_mode_gtests",
+ tests = {
+ "webview_instrumentation_test_apk_single_process_mode": targets.legacy_test_config(
+ swarming = targets.swarming(
+ shards = 3,
+ ),
+ ),
+ },
+)
+
targets.legacy_basic_suite(
name = "webview_trichrome_64_cts_field_trial_tests",
tests = {
diff --git a/infra/config/targets/compound_suites.star b/infra/config/targets/compound_suites.star
index 8303326..9aae45f 100644
--- a/infra/config/targets/compound_suites.star
+++ b/infra/config/targets/compound_suites.star
@@ -46,6 +46,7 @@
"linux_flavor_specific_chromium_gtests",
"vr_android_specific_chromium_tests",
"vr_platform_specific_chromium_gtests",
+ "webview_instrumentation_test_apk_single_process_mode_gtests",
],
)
@@ -64,6 +65,7 @@
"system_webview_shell_instrumentation_tests", # Not an experimental test
"webview_cts_tests_gtest",
"webview_ui_instrumentation_tests",
+ "webview_instrumentation_test_apk_single_process_mode_gtests",
],
)
@@ -94,6 +96,7 @@
"system_webview_shell_instrumentation_tests", # Not an experimental test
"webview_cts_tests_gtest",
"webview_ui_instrumentation_tests",
+ "webview_instrumentation_test_apk_single_process_mode_gtests",
],
)
@@ -114,6 +117,7 @@
# "vr_android_specific_chromium_tests",
# "vr_platform_specific_chromium_gtests",
"webview_64_cts_tests_gtest",
+ "webview_instrumentation_test_apk_single_process_mode_gtests",
"webview_ui_instrumentation_tests",
],
)
@@ -206,6 +210,7 @@
"linux_flavor_specific_chromium_gtests",
"vr_android_specific_chromium_tests",
"vr_platform_specific_chromium_gtests",
+ "webview_instrumentation_test_apk_single_process_mode_gtests",
],
)
diff --git a/infra/config/targets/tests.star b/infra/config/targets/tests.star
index c2ce80d..53b5cdc 100644
--- a/infra/config/targets/tests.star
+++ b/infra/config/targets/tests.star
@@ -2747,6 +2747,23 @@
name = "webview_instrumentation_test_apk",
)
+# This target is only to run on Android versions <= Android Q (10).
+targets.tests.gtest_test(
+ name = "webview_instrumentation_test_apk_single_process_mode",
+ args = [
+ "--webview-process-mode=single",
+ ],
+ binary = "webview_instrumentation_test_apk",
+)
+
+targets.tests.gtest_test(
+ name = "webview_instrumentation_test_apk_multiple_process_mode",
+ args = [
+ "--webview-process-mode=multiple",
+ ],
+ binary = "webview_instrumentation_test_apk",
+)
+
targets.tests.gtest_test(
name = "webview_instrumentation_test_apk_mutations",
args = [
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index f55fc04..0ac57c3e 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -3102,6 +3102,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_31_google_atd_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -3111,11 +3112,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -3141,7 +3142,7 @@
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 7
+ "shards": 5
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -6376,6 +6377,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_32_google_apis_x64_foldable_fyi.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -6385,11 +6387,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -9619,6 +9621,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_33_google_atd_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -9628,11 +9631,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -13189,6 +13192,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--emulator-debug-tags=all",
"--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.14.webview_instrumentation_test_apk.filter",
@@ -13201,11 +13205,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -17392,6 +17396,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.14.webview_instrumentation_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -17401,11 +17406,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -17418,7 +17423,7 @@
"os": "Android"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 7
+ "shards": 5
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 0111694..c015011 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -3046,6 +3046,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_30_google_apis_x86.textpb",
"--gtest_filter=-org.chromium.net.NetworkChangeNotifierTest.testNetworkChangeNotifierJavaObservers",
"--gs-results-bucket=chromium-result-details",
@@ -3056,11 +3057,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -3086,7 +3087,7 @@
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 7
+ "shards": 5
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -6574,6 +6575,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--use-persistent-shell",
"--avd-config=../../tools/android/avd/proto/android_31_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
@@ -6586,11 +6588,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -6616,7 +6618,7 @@
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 11
+ "shards": 10
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -9976,6 +9978,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_32_google_apis_x64_foldable.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -9985,11 +9988,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -13292,6 +13295,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -13302,11 +13306,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -14056,6 +14060,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.14.webview_instrumentation_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -14067,11 +14072,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -14084,7 +14089,7 @@
"os": "Android"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 9
+ "shards": 6
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -17049,6 +17054,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_34_google_apis_x64.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.14.webview_instrumentation_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
@@ -17060,11 +17066,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -19460,6 +19466,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -19468,11 +19475,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -19486,7 +19493,41 @@
"os": "Android"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 7
+ "shards": 5
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "args": [
+ "--webview-process-mode=single",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "device_os": "PQ3A.190801.002",
+ "device_os_flavor": "google",
+ "device_os_type": "userdebug",
+ "device_type": "walleye",
+ "os": "Android"
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -27899,6 +27940,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--use-persistent-shell",
"--avd-config=../../tools/android/avd/proto/generic_android26.textpb",
"--use-persistent-shell",
@@ -27911,11 +27953,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -27941,7 +27983,58 @@
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 12
+ "shards": 15
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "args": [
+ "--webview-process-mode=single",
+ "--use-persistent-shell",
+ "--avd-config=../../tools/android/avd/proto/generic_android26.textpb",
+ "--use-persistent-shell",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "ci_only": true,
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "cores": "4",
+ "cpu": "x86-64",
+ "device_os": null,
+ "device_type": null,
+ "os": "Ubuntu-22.04",
+ "pool": "chromium.tests.avd"
+ },
+ "named_caches": [
+ {
+ "name": "generic_android26",
+ "path": ".android_emulator/generic_android26"
+ }
+ ],
+ "optional_dimensions": {
+ "60": {
+ "caches": "generic_android26"
+ }
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 9
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -29330,6 +29423,8 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
+ "--use-persistent-shell",
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -29341,11 +29436,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -29359,7 +29454,45 @@
"os": "Android"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 9
+ "shards": 6
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "args": [
+ "--webview-process-mode=single",
+ "--use-persistent-shell",
+ "--use-persistent-shell",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "ci_only": true,
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "device_os": "PQ3A.190801.002",
+ "device_os_flavor": "google",
+ "device_os_type": "userdebug",
+ "device_type": "walleye",
+ "os": "Android"
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -32340,6 +32473,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--avd-config=../../tools/android/avd/proto/android_28_google_apis_x86.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
@@ -32350,11 +32484,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -32380,7 +32514,55 @@
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 13
+ "shards": 8
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "args": [
+ "--webview-process-mode=single",
+ "--avd-config=../../tools/android/avd/proto/android_28_google_apis_x86.textpb",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "cores": "4",
+ "cpu": "x86-64",
+ "device_os": null,
+ "device_type": null,
+ "os": "Ubuntu-22.04",
+ "pool": "chromium.tests.avd"
+ },
+ "named_caches": [
+ {
+ "name": "android_28_google_apis_x86",
+ "path": ".android_emulator/android_28_google_apis_x86"
+ }
+ ],
+ "optional_dimensions": {
+ "60": {
+ "caches": "android_28_google_apis_x86"
+ }
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 5
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
diff --git a/testing/buildbot/chromium.coverage.json b/testing/buildbot/chromium.coverage.json
index 0f49441c..5bf69717 100644
--- a/testing/buildbot/chromium.coverage.json
+++ b/testing/buildbot/chromium.coverage.json
@@ -252,6 +252,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
@@ -261,11 +262,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -279,7 +280,42 @@
"os": "Android"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 7
+ "shards": 5
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "args": [
+ "--webview-process-mode=single",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "device_os": "PQ3A.190801.002",
+ "device_os_flavor": "google",
+ "device_os_type": "userdebug",
+ "device_type": "walleye",
+ "os": "Android"
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -2705,6 +2741,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--use-persistent-shell",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
@@ -2715,11 +2752,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -2733,7 +2770,43 @@
"os": "Android"
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 36
+ "shards": 24
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "args": [
+ "--webview-process-mode=single",
+ "--use-persistent-shell",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "device_os": "PQ3A.190801.002",
+ "device_os_flavor": "google",
+ "device_os_type": "userdebug",
+ "device_type": "walleye",
+ "os": "Android"
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 12
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
@@ -7330,6 +7403,7 @@
},
{
"args": [
+ "--webview-process-mode=multiple",
"--use-persistent-shell",
"--avd-config=../../tools/android/avd/proto/generic_android26.textpb",
"--use-persistent-shell",
@@ -7342,11 +7416,11 @@
"--bucket",
"chromium-result-details",
"--test-name",
- "webview_instrumentation_test_apk"
+ "webview_instrumentation_test_apk_multiple_process_mode"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
- "name": "webview_instrumentation_test_apk",
+ "name": "webview_instrumentation_test_apk_multiple_process_mode",
"resultdb": {
"enable": true,
"has_native_resultdb_integration": true
@@ -7372,7 +7446,57 @@
}
},
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 27
+ "shards": 18
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "args": [
+ "--webview-process-mode=single",
+ "--use-persistent-shell",
+ "--avd-config=../../tools/android/avd/proto/generic_android26.textpb",
+ "--use-persistent-shell",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "cores": "4",
+ "cpu": "x86-64",
+ "device_os": null,
+ "device_type": null,
+ "os": "Ubuntu-22.04",
+ "pool": "chromium.tests.avd"
+ },
+ "named_caches": [
+ {
+ "name": "generic_android26",
+ "path": ".android_emulator/generic_android26"
+ }
+ ],
+ "optional_dimensions": {
+ "60": {
+ "caches": "generic_android26"
+ }
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 9
},
"test": "webview_instrumentation_test_apk",
"test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 51c3ae1..2503045 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -12647,6 +12647,39 @@
},
{
"args": [
+ "--webview-process-mode=single",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "webview_instrumentation_test_apk_single_process_mode"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "webview_instrumentation_test_apk_single_process_mode",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "dimensions": {
+ "device_os": "N2G48C",
+ "device_os_type": "userdebug",
+ "device_type": "bullhead",
+ "os": "Android"
+ },
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
+ },
+ "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"
],
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index e916833..e80e25fd 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -5510,7 +5510,7 @@
},
},
},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
'remove_from': [
# This test frequently fails on Android, https://crbug.com/824959
# matching android builders, the test fails on these.
@@ -5578,7 +5578,7 @@
'swarming': {
# Shard number is increased for longer test execution time and added
# local coverage data merging time.
- 'shards': 36,
+ 'shards': 24,
},
},
# If you change this, make similar changes in android-x86-code-coverage below
@@ -5587,7 +5587,7 @@
'--use-persistent-shell',
],
'swarming': {
- 'shards': 27,
+ 'shards': 15,
},
},
'android-pie-arm64-rel': {
@@ -5596,7 +5596,7 @@
],
'ci_only': True, # crbug/1368281
'swarming': {
- 'shards': 9,
+ 'shards': 6,
},
},
'android-pie-x86-rel': {
@@ -5604,7 +5604,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter',
],
'swarming': {
- 'shards': 13, # crbug.com/1294924
+ 'shards': 8, # crbug.com/1294924
},
},
'android-tablet-14-arm64-fyi-rel': {
@@ -5618,7 +5618,7 @@
'--use-persistent-shell',
],
'swarming': {
- 'shards': 27,
+ 'shards': 18,
},
},
},
@@ -5648,6 +5648,57 @@
},
}
},
+ 'webview_instrumentation_test_apk_single_process_mode': {
+ 'modifications': {
+ 'android-code-coverage-native': {
+ 'args': [
+ '--use-persistent-shell',
+ ],
+ 'swarming': {
+ # Shard number is increased for longer test execution time and added
+ # local coverage data merging time.
+ 'shards': 12,
+ },
+ },
+ # If you change this, make similar changes in android-x86-code-coverage below
+ 'android-oreo-x86-rel': {
+ # This builder is mirrored by CQ builder. Only multiple process tests run in CQ.
+ 'ci_only': True,
+ 'args': [
+ '--use-persistent-shell',
+ ],
+ 'swarming': {
+ 'shards': 9,
+ },
+ },
+ 'android-pie-arm64-rel': {
+ 'args': [
+ '--use-persistent-shell',
+ ],
+ 'ci_only': True, # crbug/1368281
+ 'swarming': {
+ 'shards': 3,
+ },
+ },
+ 'android-pie-x86-rel': {
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter',
+ ],
+ 'swarming': {
+ 'shards': 5, # crbug.com/1294924
+ },
+ },
+ # Keep this same as android-oreo-x86-rel above
+ 'android-x86-code-coverage': {
+ 'args': [
+ '--use-persistent-shell',
+ ],
+ 'swarming': {
+ 'shards': 9,
+ },
+ },
+ }
+ },
'webview_trichrome_64_cts_hostside_tests full_mode': {
'modifications': {
'android-webview-13-x64-hostside-rel': {
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index c5b7b18..984fe5d2 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -97,9 +97,13 @@
'shards': 20,
},
},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 9,
+ 'shards': 6,
},
},
},
@@ -123,9 +127,13 @@
},
},
'viz_unittests': {},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 7,
+ 'shards': 5,
},
},
},
@@ -163,9 +171,13 @@
'gl_unittests': {},
'mojo_test_apk': {},
'ui_android_unittests': {},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 7,
+ 'shards': 5,
},
},
},
@@ -177,9 +189,22 @@
},
},
'mojo_test_apk': {},
- 'webview_instrumentation_test_apk': {
+ 'webview_instrumentation_test_apk_multiple_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=multiple',
+ ],
'swarming': {
- 'shards': 7,
+ 'shards': 5,
+ },
+ },
+ 'webview_instrumentation_test_apk_single_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=single',
+ ],
+ 'swarming': {
+ 'shards': 3,
},
},
},
@@ -5513,6 +5538,18 @@
},
},
+ 'webview_instrumentation_test_apk_single_process_mode_gtests': {
+ 'webview_instrumentation_test_apk_single_process_mode': {
+ 'test': 'webview_instrumentation_test_apk',
+ 'args': [
+ '--webview-process-mode=single',
+ ],
+ 'swarming': {
+ 'shards': 3,
+ },
+ },
+ },
+
'webview_trichrome_64_cts_field_trial_tests': {
'webview_trichrome_64_cts_tests': {
'mixins': [
@@ -5739,6 +5776,7 @@
'linux_flavor_specific_chromium_gtests',
'vr_android_specific_chromium_tests',
'vr_platform_specific_chromium_gtests',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
],
'android_oreo_emulator_gtests': [
@@ -5753,6 +5791,7 @@
'linux_flavor_specific_chromium_gtests',
'system_webview_shell_instrumentation_tests',
'webview_cts_tests_gtest',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
'webview_ui_instrumentation_tests',
],
@@ -5774,6 +5813,7 @@
'linux_flavor_specific_chromium_gtests',
'system_webview_shell_instrumentation_tests',
'webview_cts_tests_gtest',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
'webview_ui_instrumentation_tests',
],
@@ -5784,6 +5824,7 @@
'chrome_public_tests',
'system_webview_shell_instrumentation_tests',
'webview_64_cts_tests_gtest',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
'webview_ui_instrumentation_tests',
],
@@ -5849,6 +5890,7 @@
'linux_flavor_specific_chromium_gtests',
'vr_android_specific_chromium_tests',
'vr_platform_specific_chromium_gtests',
+ 'webview_instrumentation_test_apk_single_process_mode_gtests',
],
'chromium_dbg_isolated_scripts': [
