Run chrome_public_test_apk at 100% experiment on android_n5x_swarming_rel.
Bug: 731759
Change-Id: Ied650ef11b381acf050fb606a06670fe78e187de
Reviewed-on: https://chromium-review.googlesource.com/920682
Reviewed-by: Benjamin Pastene <[email protected]>
Commit-Queue: John Budorick <[email protected]>
Cr-Commit-Position: refs/heads/master@{#547753}diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index cf27c98..07600f3 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -9887,6 +9887,51 @@
},
{
"args": [
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
+ "experiment_percentage": 100,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "chrome_public_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": 1500,
+ "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"
+ }
+ ],
+ "shards": 10
+ },
+ "test": "chrome_public_test_apk"
+ },
+ {
+ "args": [
"--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
diff --git a/testing/buildbot/chromium.swarm.json b/testing/buildbot/chromium.swarm.json
index 489881a..aaaa66f 100644
--- a/testing/buildbot/chromium.swarm.json
+++ b/testing/buildbot/chromium.swarm.json
@@ -362,6 +362,51 @@
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
+ "experiment_percentage": 100,
+ "merge": {
+ "args": [
+ "--bucket",
+ "chromium-result-details",
+ "--test-name",
+ "chrome_public_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"
+ }
+ ],
+ "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"
+ }
+ ],
+ "shards": 14
+ },
+ "test": "chrome_public_test_apk"
+ },
+ {
+ "args": [
+ "--gs-results-bucket=chromium-result-details",
+ "--recover-devices"
+ ],
"merge": {
"args": [
"--bucket",
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index eedee3d3..0622a79 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -512,14 +512,10 @@
'Unswarmed N5X Tests Dummy Builder',
],
'remove_from': [
- # TODO(crbug.com/731759): Enable this once we're confident that it passes.
- 'Marshmallow Phone Tester (rel)',
# chromium.clang
'ToTAndroidCFI',
# chromium.memory
'Android CFI',
- # TODO(dpranke): on chromium.swarm, this is probably also an accident.
- 'Android N5X Swarm',
],
'key_removals': {
# chromium.android.fyi
@@ -566,6 +562,11 @@
'shards': 14,
},
},
+ 'Marshmallow Phone Tester (rel)': {
+ # TODO(crbug.com/731759): Enable this once we're confident that it
+ # passes.
+ 'experiment_percentage': 100,
+ },
'Marshmallow Tablet Tester': {
'swarming': {
'hard_timeout': 1800,
@@ -617,6 +618,12 @@
'hard_timeout': 0,
},
},
+ # chromium.swarm
+ 'Android N5X Swarm': {
+ # TODO(crbug.com/731759): Enable this once we're confident that it
+ # passes.
+ 'experiment_percentage': 100,
+ },
},
},
'chrome_public_test_vr_apk': {
