Enable chrome_public_test_apk on android-marshmallow-x86-rel
The test suite runs at 100% since crbug.com/1127110#c33.
Both the test pool (http://shortn/_1u6L1a43uG) and the builder pool
(http://shortn/_8L9MTVnAdc) are in a good shape. So it should be OK to
enable it.
6 tests that fail consistently/flakiy are disabled to make test suite happy.
See crbug.com/1179791 and crbug.com/1179792 for detail.
Also remove it from the following builders.
* android-marshmallow-arm64-rel
* android-marshmallow-x86-rel-non-cq
Bug: 1127110, 1179791, 1179792
Change-Id: I4c03a39863a41e1f40d5670f6c53248d4850c05b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2702383
Commit-Queue: Haiyang Pan <[email protected]>
Reviewed-by: Ben Pastene <[email protected]>
Cr-Commit-Position: refs/heads/master@{#855489}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index e09e97b..2fd28e5d 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -732,6 +732,10 @@
'android-asan', # https://crbug.com/964562
'android-code-coverage-native', # https://crbug.com/1018780
'android-lollipop-arm-rel', # https://crbug.com/1060245
+
+ # Runs on android-marshmallow-x86-rel already (crbug.com/1127110)
+ 'android-marshmallow-arm64-rel',
+ 'android-marshmallow-x86-rel-non-cq',
],
'modifications': {
'Android CFI': {
@@ -766,11 +770,6 @@
'service_account': '[email protected]'
},
},
- 'android-marshmallow-arm64-rel': {
- 'swarming': {
- 'shards': 25,
- },
- },
'android-marshmallow-arm64-rel-swarming': {
'swarming': {
'service_account': '[email protected]'
@@ -790,13 +789,6 @@
},
],
},
- # TODD(crbug.com/1127110): Remove experimental once it works fine.
- 'experiment_percentage': 100,
- },
- 'android-marshmallow-x86-rel-non-cq': {
- 'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.chrome_public_test_apk.filter',
- ],
},
'android-pie-arm64-rel': {
'args': [
