Skip to content

GitLab

T
tangled
Commit b879ee4c authored by Dirk Pranke's avatar Dirk Pranke Committed by Commit Bot
Browse files
Options

Shift Mac 10.12 traffic onto mac minis. 

With the creation of the new 'Chrome-quarantine' pool
we accidentally left the 10.12 'Chrome' pool with no
'gpu: none' machines (i.e., no VMs) to run tasks.

This CL shifts all of the tests to physical machines
where we should have capacity.

TBR=jbudorick@chromium.org
BUG=828031
NOTRY=true

Change-Id: I1624d86887e65913330bc11b0cb1b05ddc05e1f9
Reviewed-on: https://chromium-review.googlesource.com/1103846
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567921}
parent 0eec8bac
Hide whitespace changes
Inline Side-by-side
Showing with 557 additions and 75 deletions
testing/buildbot/chromium.mac.json
View file @ b879ee4c
......@@ -1066,115 +1066,229 @@
"gtest_tests": [
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "accessibility_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "angle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "app_shell_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "base_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "battor_agent_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "blink_common_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "blink_heap_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "blink_platform_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "boringssl_crypto_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "boringssl_ssl_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "cacheinvalidation_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "capture_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "cast_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "cc_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "chrome_app_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "chromedriver_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "components_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "components_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "content_browsertests"
},
......@@ -1186,13 +1300,25 @@
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
],
"shards": 2
},
"test": "content_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "content_unittests"
},
......@@ -1203,302 +1329,602 @@
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "content_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "crashpad_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "cronet_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "crypto_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "device_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "display_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "extensions_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "gcm_unit_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "gfx_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "gin_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "gn_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "gpu_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "headless_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "headless_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
],
"shards": 2
},
"test": "interactive_ui_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "ipc_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "libjingle_xmpp_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "mac_installer_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "media_blink_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "media_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "media_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "message_center_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "midi_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "mojo_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "nacl_loader_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "native_theme_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "net_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "pdf_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "ppapi_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "printing_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "remoting_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "sandbox_mac_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "service_manager_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "services_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "shell_dialogs_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "snapshot_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "sql_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "storage_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "sync_integration_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "ui_base_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "unit_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "url_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "views_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "viz_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "webkit_unit_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
},
"test": "wtf_unittests"
}
......@@ -1511,28 +1937,52 @@
"isolate_name": "chromedriver_py_tests",
"name": "chromedriver_py_tests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
}
},
{
"isolate_name": "components_perftests",
"name": "components_perftests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
}
},
{
"isolate_name": "metrics_python_tests",
"name": "metrics_python_tests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
}
},
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
}
},
{
......@@ -1543,6 +1993,12 @@
"name": "telemetry_perf_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
],
"hard_timeout": 960,
"shards": 12
}
......@@ -1555,6 +2011,12 @@
"name": "telemetry_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
],
"shards": 4
}
},
......@@ -1562,7 +2024,13 @@
"isolate_name": "views_perftests",
"name": "views_perftests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
}
},
{
......@@ -1592,7 +2060,13 @@
"isolate_name": "webkit_python_tests",
"name": "webkit_python_tests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.12.6"
}
]
}
}
]
......
testing/buildbot/waterfalls.pyl
View file @ b879ee4c
......@@ -2876,6 +2876,14 @@
},
},
'Mac10.12 Tests': {
'swarming': {
'dimension_sets': [
{
'gpu': '8086:0a2e',
'os': 'Mac-10.12.6',
},
],
},
'test_suites': {
'gtest_tests': 'chromium_mac_gtests',
'isolated_scripts': 'chromium_rel_isolated_scripts',
......
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