Add android_browsertests to tablet and code coverage bots.
This includes on 'chromium.android' the 'KitKat Tablet Tester',
'Lollipop Tablet Tester' and 'Marshmallow Tablet Tester' bots. And
on 'chromium.fyi' the 'android-code-coverage' bot.
This removes the remaining exceptions for android_browsertests,
bringing them to all bots running android gtests.
R=dpranke@chromium.org
Bug: 961849
Change-Id: I7a89ffee4f38f4f5c12bdf31edfd6c10c80d2386
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1700476
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#677861}
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 36cc9a82..1b5de54 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -3687,6 +3687,51 @@
"--bucket",
"chromium-result-details",
"--test-name",
+ "android_browsertests"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "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": "KTU84Z",
+ "device_os_type": "userdebug",
+ "device_type": "flo",
+ "os": "Android"
+ }
+ ],
+ "expiration": 10800,
+ "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"
+ }
+ ]
+ },
+ "test": "android_browsertests"
+ },
+ {
+ "args": [
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
"angle_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
@@ -9553,6 +9598,51 @@
"--bucket",
"chromium-result-details",
"--test-name",
+ "android_browsertests"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "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": "LMY49B",
+ "device_os_type": "userdebug",
+ "device_type": "flo",
+ "os": "Android"
+ }
+ ],
+ "expiration": 10800,
+ "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"
+ }
+ ]
+ },
+ "test": "android_browsertests"
+ },
+ {
+ "args": [
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
"android_webview_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
@@ -15441,6 +15531,51 @@
"--bucket",
"chromium-result-details",
"--test-name",
+ "android_browsertests"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "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": "MRA58Z",
+ "device_os_type": "userdebug",
+ "device_type": "flo",
+ "os": "Android"
+ }
+ ],
+ "expiration": 10800,
+ "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"
+ }
+ ]
+ },
+ "test": "android_browsertests"
+ },
+ {
+ "args": [
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
"android_webview_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 28e2b8da..4cab272 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -2696,6 +2696,51 @@
"--bucket",
"chromium-result-details",
"--test-name",
+ "android_browsertests"
+ ],
+ "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+ },
+ "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": "MMB29Q",
+ "device_os_type": "userdebug",
+ "device_type": "bullhead",
+ "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"
+ }
+ ]
+ },
+ "test": "android_browsertests"
+ },
+ {
+ "args": [
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "isolate_coverage_data": true,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
"android_webview_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 5cb7055..067a90b 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -16,17 +16,6 @@
# The goal is to drive the number of exceptions to zero, to make all
# the bots behave similarly.
{
- 'android_browsertests': {
- 'remove_from': [
- # TODO(crbug.com/961849): Remove these exceptions as the suite proves stable.
- # chromium.android.json
- 'KitKat Tablet Tester',
- 'Lollipop Tablet Tester',
- 'Marshmallow Tablet Tester',
- # chromium.fyi.json
- 'android-code-coverage',
- ],
- },
'android_webview_unittests': {
'remove_from': [
# On chromium.android, these do not need to run prior to M.
