Commit 70fa918b authored by Hans Wennborg's avatar Hans Wennborg

Android test exclusions: don't exclude mojo_test_apk

These tests do pass on some bots, e.g. [1], and it's not clear why they
were being excluded. If there's a legitimate reason for them not to run
on Android, let's figure it out and get a bug filed.

Sheriffs: if this causes the tests to start failing on Android bots,
please file a bug with information about the error, put the exclusion
back and reference the bug.

Bug: 842698

 [1] https://ci.chromium.org/buildbot/chromium.clang/ToTAndroid/3343

R=kbr@chromium.org, thakis@chromium.org

Change-Id: Ia3735e9ce17759f62b823eb5df3907f00547786c
Reviewed-on: https://chromium-review.googlesource.com/1063833
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559529}
parent 78599b53
...@@ -773,6 +773,12 @@ ...@@ -773,6 +773,12 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "mojo_test_apk"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -1004,6 +1010,12 @@ ...@@ -1004,6 +1010,12 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "mojo_test_apk"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -1850,6 +1862,33 @@ ...@@ -1850,6 +1862,33 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_os": "LMY47W",
"device_type": "sprout"
}
],
"expiration": 14400,
"hard_timeout": 300
},
"test": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -3499,6 +3538,50 @@ ...@@ -3499,6 +3538,50 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"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": "NRD91N",
"device_type": "bullhead"
}
],
"expiration": 10800,
"hard_timeout": 960,
"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": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -4247,6 +4330,12 @@ ...@@ -4247,6 +4330,12 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "mojo_test_apk"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -4495,6 +4584,12 @@ ...@@ -4495,6 +4584,12 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "mojo_test_apk"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -5342,6 +5437,31 @@ ...@@ -5342,6 +5437,31 @@
}, },
"test": "midi_unittests" "test": "midi_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho"
}
],
"hard_timeout": 300
},
"test": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -6404,6 +6524,31 @@ ...@@ -6404,6 +6524,31 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "gce_x86"
}
],
"hard_timeout": 300
},
"test": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
...@@ -5500,6 +5500,50 @@ ...@@ -5500,6 +5500,50 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"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_type": "flo"
}
],
"expiration": 10800,
"hard_timeout": 300,
"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": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -7360,6 +7404,50 @@ ...@@ -7360,6 +7404,50 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"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": "LMY48I",
"device_type": "hammerhead"
}
],
"expiration": 10800,
"hard_timeout": 960,
"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": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -9219,6 +9307,50 @@ ...@@ -9219,6 +9307,50 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"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_type": "flo"
}
],
"expiration": 10800,
"hard_timeout": 120,
"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": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -11094,6 +11226,49 @@ ...@@ -11094,6 +11226,49 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"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_type": "bullhead"
}
],
"hard_timeout": 960,
"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": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -14911,6 +15086,50 @@ ...@@ -14911,6 +15086,50 @@
}, },
"test": "media_unittests" "test": "media_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"mojo_test_apk"
],
"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_type": "flo"
}
],
"expiration": 10800,
"hard_timeout": 300,
"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": "mojo_test_apk"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
...@@ -5817,6 +5817,18 @@ ...@@ -5817,6 +5817,18 @@
}, },
"test": "midi_unittests" "test": "midi_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho"
}
],
"hard_timeout": 300
},
"test": "mojo_test_apk"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
......
...@@ -1823,27 +1823,6 @@ ...@@ -1823,27 +1823,6 @@
], ],
}, },
'mojo_test_apk': { 'mojo_test_apk': {
'remove_from': [
# On chromium.android, unclear why these aren't run on all bots.
'KitKat Tablet Tester',
'Lollipop Phone Tester',
'Lollipop Tablet Tester',
'Marshmallow 64 bit Tester',
'Marshmallow Tablet Tester',
'Nougat Phone Tester',
# chromium.android.fyi
'Jelly Bean Tester',
'Lollipop Consumer Tester',
'Lollipop Low-end Tester',
'Unswarmed N5 Tests Dummy Builder',
'Unswarmed N5X Tests Dummy Builder',
'x64 Device Tester',
'x86 Cloud Tester',
# chromium.clang
'ToTAndroid x64',
# chromium.fyi
'Out of Process Profiling Android',
],
'modifications': { 'modifications': {
# chromium.clang # chromium.clang
'ToTAndroidCFI': { 'ToTAndroidCFI': {
......
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