Skip to content

GitLab

T
tangled
Commit 6225f6c9 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot
Browse files
Options

Move chromium.dev's tests to a pool with templates. 

Needs crrev.com/c/2070324 landed & deployed to staging before this can
land.

Bug: 812428
Change-Id: I06d240b78dfcb8d7b5e735a5c67498c55041c9c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2057783Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744772}
parent 43dea631
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 34 deletions
testing/buildbot/chromium.dev.json
View file @ 6225f6c9
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
"device_os": "KTU84P", "device_os": "KTU84P",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -77,7 +78,8 @@ ...@@ -77,7 +78,8 @@
"device_os": "KTU84P", "device_os": "KTU84P",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -124,7 +126,8 @@ ...@@ -124,7 +126,8 @@
"device_os": "KTU84P", "device_os": "KTU84P",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -171,7 +174,8 @@ ...@@ -171,7 +174,8 @@
"device_os": "KTU84P", "device_os": "KTU84P",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -218,7 +222,8 @@ ...@@ -218,7 +222,8 @@
"device_os": "KTU84P", "device_os": "KTU84P",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -265,7 +270,8 @@ ...@@ -265,7 +270,8 @@
"device_os": "KTU84P", "device_os": "KTU84P",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -312,7 +318,8 @@ ...@@ -312,7 +318,8 @@
"device_os": "KTU84P", "device_os": "KTU84P",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "hammerhead", "device_type": "hammerhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -363,7 +370,8 @@ ...@@ -363,7 +370,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -409,7 +417,8 @@ ...@@ -409,7 +417,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -456,7 +465,8 @@ ...@@ -456,7 +465,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -503,7 +513,8 @@ ...@@ -503,7 +513,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -550,7 +561,8 @@ ...@@ -550,7 +561,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -597,7 +609,8 @@ ...@@ -597,7 +609,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -644,7 +657,8 @@ ...@@ -644,7 +657,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -691,7 +705,8 @@ ...@@ -691,7 +705,8 @@
"device_os": "MMB29Q", "device_os": "MMB29Q",
"device_os_type": "userdebug", "device_os_type": "userdebug",
"device_type": "bullhead", "device_type": "bullhead",
"os": "Android" "os": "Android",
"pool": "chromium.tests.template"
} }
], ],
"expiration": 10800, "expiration": 10800,
...@@ -724,7 +739,8 @@ ...@@ -724,7 +739,8 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cores": "2", "cores": "2",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04",
"pool": "chromium.tests.template"
} }
] ]
}, },
...@@ -741,7 +757,8 @@ ...@@ -741,7 +757,8 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cores": "8", "cores": "8",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04",
"pool": "chromium.tests.template"
} }
], ],
"shards": 2 "shards": 2
...@@ -759,7 +776,8 @@ ...@@ -759,7 +776,8 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cores": "8", "cores": "8",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04",
"pool": "chromium.tests.template"
} }
] ]
}, },
...@@ -776,7 +794,8 @@ ...@@ -776,7 +794,8 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cores": "2", "cores": "2",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04",
"pool": "chromium.tests.template"
} }
] ]
}, },
...@@ -793,7 +812,8 @@ ...@@ -793,7 +812,8 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cores": "8", "cores": "8",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04",
"pool": "chromium.tests.template"
} }
] ]
}, },
...@@ -810,7 +830,8 @@ ...@@ -810,7 +830,8 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cores": "8", "cores": "8",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04",
"pool": "chromium.tests.template"
} }
] ]
}, },
...@@ -827,7 +848,8 @@ ...@@ -827,7 +848,8 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cores": "2", "cores": "2",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04",
"pool": "chromium.tests.template"
} }
] ]
}, },
...@@ -844,7 +866,12 @@ ...@@ -844,7 +866,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "base_unittests", "test": "base_unittests",
"test_target": "//base:base_unittests" "test_target": "//base:base_unittests"
...@@ -855,7 +882,12 @@ ...@@ -855,7 +882,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "content_browsertests", "test": "content_browsertests",
"test_target": "//content/test:content_browsertests" "test_target": "//content/test:content_browsertests"
...@@ -866,7 +898,12 @@ ...@@ -866,7 +898,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "content_unittests", "test": "content_unittests",
"test_target": "//content/test:content_unittests" "test_target": "//content/test:content_unittests"
...@@ -877,7 +914,12 @@ ...@@ -877,7 +914,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "interactive_ui_tests", "test": "interactive_ui_tests",
"test_target": "//chrome/test:interactive_ui_tests" "test_target": "//chrome/test:interactive_ui_tests"
...@@ -888,7 +930,12 @@ ...@@ -888,7 +930,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "net_unittests", "test": "net_unittests",
"test_target": "//net:net_unittests" "test_target": "//net:net_unittests"
...@@ -899,7 +946,12 @@ ...@@ -899,7 +946,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "unit_tests", "test": "unit_tests",
"test_target": "//chrome/test:unit_tests" "test_target": "//chrome/test:unit_tests"
...@@ -914,7 +966,12 @@ ...@@ -914,7 +966,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "base_unittests", "test": "base_unittests",
"test_target": "//base:base_unittests" "test_target": "//base:base_unittests"
...@@ -925,7 +982,12 @@ ...@@ -925,7 +982,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "content_browsertests", "test": "content_browsertests",
"test_target": "//content/test:content_browsertests" "test_target": "//content/test:content_browsertests"
...@@ -936,7 +998,12 @@ ...@@ -936,7 +998,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "content_unittests", "test": "content_unittests",
"test_target": "//content/test:content_unittests" "test_target": "//content/test:content_unittests"
...@@ -947,7 +1014,12 @@ ...@@ -947,7 +1014,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "interactive_ui_tests", "test": "interactive_ui_tests",
"test_target": "//chrome/test:interactive_ui_tests" "test_target": "//chrome/test:interactive_ui_tests"
...@@ -958,7 +1030,12 @@ ...@@ -958,7 +1030,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "net_unittests", "test": "net_unittests",
"test_target": "//net:net_unittests" "test_target": "//net:net_unittests"
...@@ -969,7 +1046,12 @@ ...@@ -969,7 +1046,12 @@
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
}, },
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true,
"dimension_sets": [
{
"pool": "chromium.tests.template"
}
]
}, },
"test": "unit_tests", "test": "unit_tests",
"test_target": "//chrome/test:unit_tests" "test_target": "//chrome/test:unit_tests"
......
testing/buildbot/mixins.pyl
View file @ 6225f6c9
...@@ -164,6 +164,15 @@ ...@@ -164,6 +164,15 @@
}, },
}, },
}, },
# TODO(crbug.com/812428): Remove this mixin after all test pools have migrated
# to using templates.
'chromium-template-pool': {
'swarming': {
'dimensions': {
'pool': 'chromium.tests.template',
},
},
},
'code-coverage': { 'code-coverage': {
'isolate_coverage_data': True, 'isolate_coverage_data': True,
}, },
......
testing/buildbot/waterfalls.pyl
View file @ 6225f6c9
...@@ -1348,6 +1348,7 @@ ...@@ -1348,6 +1348,7 @@
'machines': { 'machines': {
'android-kitkat-arm-rel-swarming': { 'android-kitkat-arm-rel-swarming': {
'mixins': [ 'mixins': [
'chromium-template-pool',
'kitkat', 'kitkat',
'hammerhead', 'hammerhead',
], ],
...@@ -1360,6 +1361,9 @@ ...@@ -1360,6 +1361,9 @@
'os_type': 'android', 'os_type': 'android',
}, },
'android-marshmallow-arm64-rel-swarming': { 'android-marshmallow-arm64-rel-swarming': {
'mixins': [
'chromium-template-pool',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_swarm_android_gtests', 'gtest_tests': 'chromium_swarm_android_gtests',
}, },
...@@ -1378,17 +1382,24 @@ ...@@ -1378,17 +1382,24 @@
'linux-rel-swarming': { 'linux-rel-swarming': {
'mixins': [ 'mixins': [
'linux-xenial', 'linux-xenial',
'chromium-template-pool',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_swarm_linux_gtests', 'gtest_tests': 'chromium_swarm_linux_gtests',
}, },
}, },
'mac-rel-swarming': { 'mac-rel-swarming': {
'mixins': [
'chromium-template-pool',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_swarm_desktop_gtests', 'gtest_tests': 'chromium_swarm_desktop_gtests',
}, },
}, },
'win-rel-swarming': { 'win-rel-swarming': {
'mixins': [
'chromium-template-pool',
],
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_swarm_desktop_gtests', 'gtest_tests': 'chromium_swarm_desktop_gtests',
}, },
......
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