LUCI + test configurations for mac-cocoa-rel.
Bug: 855301
Change-Id: I2a632402934b865ecc2b87c30262261a0e7d274d
Reviewed-on: https://chromium-review.googlesource.com/1117363
Reviewed-by: Stephen Martinis <[email protected]>
Commit-Queue: John Budorick <[email protected]>
Cr-Commit-Position: refs/heads/master@{#570925}diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 202519b..f322c1a 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -3200,6 +3200,56 @@
}
]
},
+ "mac-cocoa-rel": {
+ "gtest_tests": [
+ {
+ "args": [
+ "--disable-features=ViewsBrowserWindows",
+ "--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": "none",
+ "pool": "Chrome-quarantine"
+ }
+ ],
+ "shards": 10
+ },
+ "test": "browser_tests"
+ },
+ {
+ "args": [
+ "--disable-features=ViewsBrowserWindows"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
+ "test": "components_browsertests"
+ },
+ {
+ "args": [
+ "--disable-features=ViewsBrowserWindows"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true
+ },
+ "test": "content_browsertests"
+ },
+ {
+ "args": [
+ "--disable-features=ViewsBrowserWindows"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "shards": 3
+ },
+ "test": "interactive_ui_tests"
+ }
+ ]
+ },
"mac-jumbo-rel": {
"additional_compile_targets": [
"all"
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 480b1808..ddbc84b0 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -3467,7 +3467,8 @@
},
{
"swarming": {
- "can_use_on_swarming_builders": true
+ "can_use_on_swarming_builders": true,
+ "shards": 3
},
"test": "interactive_ui_tests"
}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 5b3242c9..d327120a3 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -293,6 +293,22 @@
],
},
},
+ 'mac-cocoa-rel': {
+ # 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',
+ 'gpu': 'none',
+ },
+ ],
+ },
+ },
# chromium.memory
'Linux ASan LSan Tests (1)': {
# These are very slow on the ASAN trybot for some reason.
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 773273d..fda3a8c 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -469,7 +469,11 @@
},
'components_browsertests': {},
'content_browsertests': {},
- 'interactive_ui_tests': {},
+ 'interactive_ui_tests': {
+ 'swarming': {
+ 'shards': 3,
+ },
+ },
},
'chromium_gtests': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index b5e9f02..c19597b 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -2909,6 +2909,14 @@
'pdf_fuzzers',
],
},
+ 'mac-cocoa-rel': {
+ 'test_suites': {
+ 'gtest_tests': 'chromium_browser_tests',
+ },
+ 'args': [
+ '--disable-features=ViewsBrowserWindows',
+ ],
+ },
'mac-jumbo-rel': {
'additional_compile_targets': [
'all'
