Skip to content

GitLab

T
tangled
Commit aba8bad2 authored by Shenghua Zhang's avatar Shenghua Zhang Committed by Commit Bot
Browse files
Options

[Mac os] Support Mac10.9 CQ tests run on multiple dimension swarming 

In the case of migrating Chrome mac 10.9 bots to 10.13, make use of
the trigger tool
//testing/trigger_scripts/trigger_multiple_dimensions_unittest.py, to
support buider chromium.mac bot 'Mac10.9 Tests' running tests on
either 10.9 or 10.13 bots in a load-balancing way.

This CL:
1) adds add_common_test_properties in generate_buildbot_json.py which
adds the tigger script logic.
2) add 'alternate_swarming_dimensions' for 'Mac10.9 Tests' tester config
in waterfalls.py
3) manually run generate_buildbot_json.py and generated the multiple
swarming dimensions configs in chromium.mac.json

Bug: 805475
Change-Id: I4aeb4b67d085c58e777c59e9685e39e3d5504598
Reviewed-on: https://chromium-review.googlesource.com/898534
Commit-Queue: Shenghua Zhang <shenghuazhang@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534879}
parent 37608a0e
Hide whitespace changes
Inline Side-by-side
Showing with 1451 additions and 132 deletions
testing/buildbot/chromium.mac.json
View file @ aba8bad2
......@@ -1385,389 +1385,1477 @@
"gtest_tests": [
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "accessibility_unittests"
"test": "accessibility_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "base_unittests"
"test": "base_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "battor_agent_unittests"
"test": "battor_agent_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "blink_heap_unittests"
"test": "blink_heap_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "blink_platform_unittests"
"test": "blink_platform_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "boringssl_crypto_tests"
"test": "boringssl_crypto_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "boringssl_ssl_tests"
"test": "boringssl_ssl_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
],
"shards": 10
},
"test": "browser_tests"
"test": "browser_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "cacheinvalidation_unittests"
"test": "cacheinvalidation_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "capture_unittests"
"test": "capture_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "cast_unittests"
"test": "cast_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "cc_unittests"
"test": "cc_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "chrome_app_unittests"
"test": "chrome_app_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "chromedriver_unittests"
"test": "chromedriver_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "components_browsertests"
"test": "components_browsertests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "components_unittests"
"test": "components_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "content_browsertests"
"test": "content_browsertests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "content_unittests"
"test": "content_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "crashpad_tests"
"test": "crashpad_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "crypto_unittests"
"test": "crypto_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "device_unittests"
"test": "device_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "display_unittests"
"test": "display_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "extensions_unittests"
"test": "extensions_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "gcm_unit_tests"
"test": "gcm_unit_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "gfx_unittests"
"test": "gfx_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "gn_unittests"
"test": "gn_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "google_apis_unittests"
"test": "google_apis_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "gpu_ipc_service_unittests"
"test": "gpu_ipc_service_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "gpu_unittests"
"test": "gpu_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "headless_browsertests"
"test": "headless_browsertests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "headless_unittests"
"test": "headless_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
],
"shards": 2
},
"test": "interactive_ui_tests"
"test": "interactive_ui_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "ipc_tests"
"test": "ipc_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "jingle_unittests"
"test": "jingle_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "libjingle_xmpp_unittests"
"test": "libjingle_xmpp_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "mac_installer_unittests"
"test": "mac_installer_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "media_blink_unittests"
"test": "media_blink_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "media_unittests"
"test": "media_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "midi_unittests"
"test": "midi_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "mojo_common_unittests"
"test": "mojo_common_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "mojo_public_bindings_unittests"
"test": "mojo_public_bindings_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "mojo_public_system_unittests"
"test": "mojo_public_system_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "mojo_system_unittests"
"test": "mojo_system_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "nacl_loader_unittests"
"test": "nacl_loader_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "native_theme_unittests"
"test": "native_theme_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "net_unittests"
"test": "net_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "pdf_unittests"
"test": "pdf_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "ppapi_unittests"
"test": "ppapi_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "printing_unittests"
"test": "printing_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "remoting_unittests"
"test": "remoting_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "sandbox_mac_unittests"
"test": "sandbox_mac_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "services_unittests"
"test": "services_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "skia_unittests"
"test": "skia_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "snapshot_unittests"
"test": "snapshot_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "sql_unittests"
"test": "sql_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "storage_unittests"
"test": "storage_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "sync_integration_tests"
"test": "sync_integration_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "ui_base_unittests"
"test": "ui_base_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "unit_tests"
"test": "unit_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "url_unittests"
"test": "url_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "views_unittests"
"test": "views_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "viz_unittests"
"test": "viz_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "webkit_unit_tests"
"test": "webkit_unit_tests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"test": "wtf_unittests"
"test": "wtf_unittests",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
}
],
"isolated_scripts": [
......@@ -1778,28 +2866,96 @@
"isolate_name": "chromedriver_py_tests",
"name": "chromedriver_py_tests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"isolate_name": "content_shell_crash_test",
"name": "content_shell_crash_test",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"isolate_name": "metrics_python_tests",
"name": "metrics_python_tests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
......@@ -1810,21 +2966,72 @@
"name": "telemetry_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
],
"shards": 4
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"isolate_name": "views_perftests",
"name": "views_perftests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
},
{
"isolate_name": "webkit_python_tests",
"name": "webkit_python_tests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "x86-64",
"gpu": "none",
"os": "Mac-10.9",
"pool": "Chrome"
}
]
},
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\"gpu\": \"none\", \"os\": \"Mac-10.9\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}, {\"gpu\": \"8086:0a2e\", \"os\": \"Mac-10.13\", \"cpu\": \"x86-64\", \"pool\": \"Chrome\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
}
],
......
testing/buildbot/generate_buildbot_json.py
View file @ aba8bad2
......@@ -375,6 +375,19 @@ class BBJSONGenerator(object):
self.clean_swarming_dictionary(test['swarming'])
return test
def add_common_test_properties(self, test, tester_config):
if tester_config.get('use_multi_dimension_trigger_script'):
test['trigger_script'] = {
'script': '//testing/trigger_scripts/trigger_multiple_dimensions.py',
'args': [
'--multiple-trigger-configs',
json.dumps(tester_config['swarming']['dimension_sets'] +
tester_config.get('alternate_swarming_dimensions', [])),
'--multiple-dimension-script-verbose',
'True'
],
}
def generate_gtest(self, waterfall, tester_name, tester_config, test_name,
test_config):
if not self.should_run_on_tester(
......@@ -429,6 +442,7 @@ class BBJSONGenerator(object):
result = self.update_and_cleanup_test(result, test_name, tester_name,
waterfall)
self.add_common_test_properties(result, tester_config)
return result
def generate_isolated_script_test(self, waterfall, tester_name, tester_config,
......@@ -442,6 +456,7 @@ class BBJSONGenerator(object):
self.initialize_swarming_dictionary_for_test(result, tester_config)
result = self.update_and_cleanup_test(result, test_name, tester_name,
waterfall)
self.add_common_test_properties(result, tester_config)
return result
def generate_script_test(self, waterfall, tester_name, tester_config,
......
testing/buildbot/generate_buildbot_json_unittest.py
View file @ aba8bad2
......@@ -48,6 +48,36 @@ FOO_GTESTS_WATERFALL = """\
]
"""
FOO_GTESTS_MULTI_DIMENSION_WATERFALL = """\
[
{
'name': 'chromium.test',
'machines': {
'Fake Tester': {
'swarming': {
'dimension_sets': [
{
"gpu": "none",
"os": "1",
},
],
},
'use_multi_dimension_trigger_script': True,
'alternate_swarming_dimensions': [
{
"gpu": "none",
"os": "2",
},
],
'test_suites': {
'gtest_tests': 'foo_tests',
},
},
},
},
]
"""
COMPOSITION_GTEST_SUITE_WATERFALL = """\
[
{
......@@ -840,6 +870,41 @@ ANDROID_WATERFALL_OUTPUT = """\
}
"""
MULTI_DIMENSION_OUTPUT = """\
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"Fake Tester": {
"gtest_tests": [
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "none",
"integrity": "high",
"os": "1"
}
],
"expiration": 120
},
"test": "foo_test",
"trigger_script": {
"args": [
"--multiple-trigger-configs",
"[{\\"gpu\\": \\"none\\", \\"os\\": \\"1\\"}, \
{\\"gpu\\": \\"none\\", \\"os\\": \\"2\\"}]",
"--multiple-dimension-script-verbose",
"True"
],
"script": "//testing/trigger_scripts/trigger_multiple_dimensions.py"
}
}
]
}
}
"""
class UnitTest(unittest.TestCase):
def test_base_generator(self):
# Only needed for complete code coverage.
......@@ -856,6 +921,12 @@ class UnitTest(unittest.TestCase):
EMPTY_EXCEPTIONS)
fbb.check_input_file_consistency()
def test_good_multi_dimension_test_suites_are_ok(self):
fbb = FakeBBGen(FOO_GTESTS_MULTI_DIMENSION_WATERFALL,
FOO_TEST_SUITE,
EMPTY_EXCEPTIONS)
fbb.check_input_file_consistency()
def test_good_composition_test_suites_are_ok(self):
fbb = FakeBBGen(COMPOSITION_GTEST_SUITE_WATERFALL,
GOOD_COMPOSITION_TEST_SUITES,
......@@ -1033,6 +1104,13 @@ class UnitTest(unittest.TestCase):
fbb.files['chromium.test.json'] = COMPOSITION_WATERFALL_WITH_ARGS_OUTPUT
fbb.check_output_file_consistency(verbose=True)
def test_multi_dimension_output(self):
fbb = FakeBBGen(FOO_GTESTS_MULTI_DIMENSION_WATERFALL,
FOO_TEST_SUITE,
EMPTY_EXCEPTIONS)
fbb.files['chromium.test.json'] = MULTI_DIMENSION_OUTPUT
fbb.check_output_file_consistency(verbose=True)
if __name__ == '__main__':
unittest.main()
......
testing/buildbot/waterfalls.pyl
View file @ aba8bad2
......@@ -1569,6 +1569,25 @@
'isolated_scripts': 'chromium_rel_isolated_scripts',
'scripts': 'chromium_scripts',
},
'swarming': {
'dimension_sets': [
{
"gpu": "none",
"cpu": "x86-64",
"os": "Mac-10.9",
"pool": "Chrome",
},
],
},
'use_multi_dimension_trigger_script': True,
'alternate_swarming_dimensions': [
{
"gpu": "8086:0a2e",
"cpu": "x86-64",
"os": "Mac-10.13",
"pool": "Chrome",
},
],
},
'Mac10.9 Tests (dbg)': {
'test_suites': {
......
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