Add android browser tests w/o fieldtrial to ci/android-12l-x64-dbg-tests.
* This CL adds another integration test suites without field_trial_config. This will test the code path with the default behaviors;
* This CL also splits android fieldtrial tests into two separate suites: android and webview so they can be added into two different suites.
Bug: 971387
Change-Id: Ifcd0aca6b0eaaa2d1b406c59bce0c0c315085a12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4629610
Reviewed-by: Erik Staab <[email protected]>
Commit-Queue: Hao Wu <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1160176}
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 38badf9..83df47f6 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -11212,6 +11212,69 @@
},
{
"args": [
+ "--disable-field-trial-config",
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices",
+ "--avd-config=../../tools/android/avd/proto/generic_android32_foldable.textpb"
+ ],
+ "ci_only": true,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "android_browsertests_no_fieldtrial"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "name": "android_browsertests_no_fieldtrial",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cores": "8",
+ "cpu": "x86-64",
+ "device_os": null,
+ "device_type": null,
+ "os": "Ubuntu-22.04",
+ "pool": "chromium.tests.avd"
+ }
+ ],
+ "named_caches": [
+ {
+ "name": "generic_android32_foldable",
+ "path": ".android_emulator/generic_android32_foldable"
+ }
+ ],
+ "optional_dimensions": {
+ "60": [
+ {
+ "caches": "generic_android32_foldable"
+ }
+ ]
+ },
+ "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": "[email protected]",
+ "shards": 3
+ },
+ "test": "android_browsertests",
+ "test_id_prefix": "ninja://chrome/test:android_browsertests/"
+ },
+ {
+ "args": [
"--test-launcher-batch-limit=1",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 80f9f04..18cfe8f 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -2721,6 +2721,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
+ "ci_only": true,
"merge": {
"args": [
"--bucket",
@@ -2780,6 +2781,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
+ "ci_only": true,
"merge": {
"args": [
"--bucket",
@@ -2846,6 +2848,7 @@
"--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
+ "ci_only": true,
"merge": {
"args": [
"--bucket",
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 9ae6d99..440542e 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -147,6 +147,11 @@
},
},
},
+ 'android_browsertests_no_fieldtrial': {
+ 'remove_from': [
+ 'android-12l-x64-fyi-dbg',
+ ],
+ },
'android_sync_integration_tests': {
'modifications': {
'android-12-x64-rel': {
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 33521fa..752360f 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -2321,33 +2321,12 @@
'args': [
'--disable-field-trial-config',
],
+ 'ci_only': True,
'test': 'android_browsertests',
'swarming': {
'shards': 3,
},
},
- 'webview_cts_tests_no_field_trial': {
- 'args': [
- '--disable-field-trial-config',
- ],
- 'swarming': {
- 'shards': 2,
- 'cipd_packages': [
- {
- "cipd_package": 'chromium/android_webview/tools/cts_archive',
- 'location': 'android_webview/tools/cts_archive',
- 'revision': 'D9ziv4Z61qHwterMTFEoPeCZzFNyUfMnWAlYuxEKlM8C',
- }
- ]
- },
- 'test': 'webview_cts_tests',
- },
- 'webview_ui_test_app_test_apk_no_field_trial': {
- 'args': [
- '--disable-field-trial-config',
- ],
- 'test': 'webview_ui_test_app_test_apk',
- },
},
'fieldtrial_browser_tests': {
'browser_tests_no_field_trial': {
@@ -2382,7 +2361,32 @@
'test': 'sync_integration_tests',
},
},
-
+ 'fieldtrial_webview_tests': {
+ 'webview_cts_tests_no_field_trial': {
+ 'args': [
+ '--disable-field-trial-config',
+ ],
+ 'ci_only': True,
+ 'swarming': {
+ 'shards': 2,
+ 'cipd_packages': [
+ {
+ "cipd_package": 'chromium/android_webview/tools/cts_archive',
+ 'location': 'android_webview/tools/cts_archive',
+ 'revision': 'D9ziv4Z61qHwterMTFEoPeCZzFNyUfMnWAlYuxEKlM8C',
+ }
+ ]
+ },
+ 'test': 'webview_cts_tests',
+ },
+ 'webview_ui_test_app_test_apk_no_field_trial': {
+ 'args': [
+ '--disable-field-trial-config',
+ ],
+ 'ci_only': True,
+ 'test': 'webview_ui_test_app_test_apk',
+ },
+ },
'finch_smoke_tests': {
# TODO(crbug.com/1227222): Change this to the actual finch smoke test
# once it exists.
@@ -5863,7 +5867,10 @@
'android_12_dbg_emulator_gtests': [
'android_trichrome_smoke_tests',
],
-
+ 'android_finch_fieldtrial_tests': [
+ 'fieldtrial_android_tests',
+ 'fieldtrial_webview_tests',
+ ],
'android_marshmallow_gtests': [
'android_smoke_tests',
'android_specific_chromium_gtests', # Already includes gl_gtests.
@@ -6866,6 +6873,7 @@
'android_specific_chromium_gtests': {}, # Already includes gl_gtests.
'chromium_gtests': {},
'chromium_gtests_for_devices_with_graphical_output': {},
+ 'fieldtrial_android_tests': {},
'linux_flavor_specific_chromium_gtests': {},
'system_webview_shell_instrumentation_tests': {}, # Not an experimental test
'webengine_android_gtests': {},
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index a4402a2e..b30a01f 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -3237,7 +3237,7 @@
],
'os_type': 'android',
'test_suites': {
- 'gtest_tests': 'fieldtrial_android_tests',
+ 'gtest_tests': 'android_finch_fieldtrial_tests',
},
},
