Reenable browser_tests on chromium.mac in quarantine pool.
This re-enables just the browser_tests suite on the
chromium.mac bots and the matching trybots. The tests
on Mac10.13 Tests are still marked as experimental, so
failures there won't block the CQ. The re-enabled tests
will run in the 'Chrome-quarantine' pool, which means
that if the tests kill the machines, it should only
affect the machines in that pool, and not the machines
in the main 'Chrome' pool.
The tests are still disabled on chromium.clang, chromium.fyi,
and chromium.memory, and viz_browser_tests and
surface_sync_browser_tests are still disabled everywhere.
If it looks like this approach is working, we can reenable
those as well as long as they go into the quarantine pool.
R=jbudorick@chromium.org
BUG=828031
NOTRY=true
Change-Id: I2e914b68584fd4d718aba246906f38b0724a08f1
Reviewed-on: https://chromium-review.googlesource.com/1103796
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567922}diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 05edb83..9961570 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -69,6 +69,22 @@
"test": "boringssl_ssl_tests"
},
{
+ "args": [
+ "--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter",
+ "--gtest_shuffle"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "pool": "Chrome-quarantine"
+ }
+ ],
+ "shards": 10
+ },
+ "test": "browser_tests"
+ },
+ {
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -603,6 +619,22 @@
"test": "boringssl_ssl_tests"
},
{
+ "args": [
+ "--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter",
+ "--gtest_shuffle"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "pool": "Chrome-quarantine"
+ }
+ ],
+ "shards": 10
+ },
+ "test": "browser_tests"
+ },
+ {
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -1185,6 +1217,24 @@
"test": "boringssl_ssl_tests"
},
{
+ "args": [
+ "--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter",
+ "--gtest_shuffle"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "gpu": "8086:0a2e",
+ "os": "Mac-10.12.6",
+ "pool": "Chrome-quarantine"
+ }
+ ],
+ "shards": 10
+ },
+ "test": "browser_tests"
+ },
+ {
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -2134,6 +2184,23 @@
"test": "boringssl_ssl_tests"
},
{
+ "args": [
+ "--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter",
+ "--gtest_shuffle"
+ ],
+ "experiment_percentage": 100,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "pool": "Chrome-quarantine"
+ }
+ ],
+ "shards": 10
+ },
+ "test": "browser_tests"
+ },
+ {
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -2671,6 +2738,22 @@
"test": "boringssl_ssl_tests"
},
{
+ "args": [
+ "--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter",
+ "--gtest_shuffle"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "pool": "Chrome-quarantine"
+ }
+ ],
+ "shards": 10
+ },
+ "test": "browser_tests"
+ },
+ {
"swarming": {
"can_use_on_swarming_builders": true
},
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index b0d1139..45a3fe2d 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -202,12 +202,6 @@
'Chromium Mac 10.13', # https://crbug.com/828031
'Out of Process Profiling Mac', # https://crbug.com/828031
'mac-views-rel', # https://crbug.com/828031
- # chromium.mac
- 'Mac10.10 Tests', # https://crbug.com/828031
- 'Mac10.11 Tests', # https://crbug.com/828031
- 'Mac10.12 Tests', # https://crbug.com/828031
- 'Mac10.13 Tests', # https://crbug.com/828031
- 'Mac10.13 Tests (dbg)', # https://crbug.com/828031
# chromium.memory
'Linux TSan Tests', # https://crbug.com/368525
'Mac ASan 64 Tests (1)', # https://crbug.com/828031
@@ -238,6 +232,83 @@
'shards': 5,
},
},
+ # chromium.mac
+ 'Mac10.10 Tests': {
+ # A subset of tests seem to cause WindowServer deaths on VMs.
+ # crbug.com/828031 et al.
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter',
+ '--gtest_shuffle',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'pool': 'Chrome-quarantine',
+ },
+ ],
+ },
+ },
+ 'Mac10.11 Tests': {
+ # A subset of tests seem to cause WindowServer deaths on VMs.
+ # crbug.com/828031 et al.
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter',
+ '--gtest_shuffle',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'pool': 'Chrome-quarantine',
+ },
+ ],
+ },
+ },
+ 'Mac10.12 Tests': {
+ # A subset of tests seem to cause WindowServer deaths on VMs.
+ # crbug.com/828031 et al.
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter',
+ '--gtest_shuffle',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'pool': 'Chrome-quarantine',
+ },
+ ],
+ },
+ },
+ 'Mac10.13 Tests': {
+ # A subset of tests seem to cause WindowServer deaths on VMs.
+ # crbug.com/828031 et al.
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter',
+ '--gtest_shuffle',
+ ],
+ 'experiment_percentage': 100,
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'pool': 'Chrome-quarantine',
+ },
+ ],
+ },
+ },
+ 'Mac10.13 Tests (dbg)': {
+ # A subset of tests seem to cause WindowServer deaths on VMs.
+ # crbug.com/828031 et al.
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter',
+ '--gtest_shuffle',
+ ],
+ 'swarming': {
+ 'dimension_sets': [
+ {
+ 'pool': 'Chrome-quarantine',
+ },
+ ],
+ },
+ },
# chromium.memory
'Linux ASan LSan Tests (1)': {
# These are very slow on the ASAN trybot for some reason.
