Skip to content

GitLab

T
tangled
Commit 17d2fcdd authored by Nico Weber's avatar Nico Weber Committed by Commit Bot
Browse files
Options

Get rid of recent win7/win10 chromium_win_gtests split again. 

Undoes the split added in https://chromium-review.googlesource.com/1081627
The motivation for that split was that we don't have capacity to run
the test on both the win7 and win10 default cq bots.
Use test_suite_exceptions.pyl to not run the tests on the win7 cq bot.

This adds the test to the clang tot bots and some more main waterfall
win bots.

Bug: 818832,839419,843511
Change-Id: I550d01b33695bf07dea3b97a4bf6a0d8b3f404f4
Reviewed-on: https://chromium-review.googlesource.com/1099135
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567353}
parent ffa1595c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1281 additions and 47 deletions
testing/buildbot/chromium.clang.json
View file @ 17d2fcdd
This diff is collapsed.
testing/buildbot/chromium.fyi.json
View file @ 17d2fcdd
...@@ -4143,6 +4143,18 @@ ...@@ -4143,6 +4143,18 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter"
],
"name": "network_service_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -4209,6 +4221,16 @@ ...@@ -4209,6 +4221,16 @@
}, },
"test": "components_browsertests" "test": "components_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -4221,6 +4243,17 @@ ...@@ -4221,6 +4243,17 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter"
],
"name": "network_service_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -4310,6 +4343,16 @@ ...@@ -4310,6 +4343,16 @@
}, },
"test": "extensions_browsertests" "test": "extensions_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -4382,6 +4425,17 @@ ...@@ -4382,6 +4425,17 @@
}, },
"test": "interactive_ui_tests" "test": "interactive_ui_tests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "interactive_ui_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
testing/buildbot/chromium.win.json
View file @ 17d2fcdd
...@@ -76,6 +76,18 @@ ...@@ -76,6 +76,18 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter"
],
"name": "network_service_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -136,6 +148,16 @@ ...@@ -136,6 +148,16 @@
}, },
"test": "components_browsertests" "test": "components_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -154,6 +176,17 @@ ...@@ -154,6 +176,17 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter"
],
"name": "network_service_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -243,6 +276,16 @@ ...@@ -243,6 +276,16 @@
}, },
"test": "extensions_browsertests" "test": "extensions_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -321,6 +364,17 @@ ...@@ -321,6 +364,17 @@
}, },
"test": "interactive_ui_tests" "test": "interactive_ui_tests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "interactive_ui_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2672,6 +2726,18 @@ ...@@ -2672,6 +2726,18 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_browser_tests.filter"
],
"name": "network_service_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2726,6 +2792,16 @@ ...@@ -2726,6 +2792,16 @@
}, },
"test": "chromedriver_unittests" "test": "chromedriver_unittests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2745,6 +2821,17 @@ ...@@ -2745,6 +2821,17 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService",
"--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter"
],
"name": "network_service_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -2828,6 +2915,16 @@ ...@@ -2828,6 +2915,16 @@
}, },
"test": "extensions_browsertests" "test": "extensions_browsertests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -2906,6 +3003,17 @@ ...@@ -2906,6 +3003,17 @@
}, },
"test": "interactive_ui_tests" "test": "interactive_ui_tests"
}, },
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "interactive_ui_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 17d2fcdd
...@@ -1636,25 +1636,38 @@ ...@@ -1636,25 +1636,38 @@
'network_service_browser_tests': { 'network_service_browser_tests': {
'remove_from': [ 'remove_from': [
# chromium.win # chromium.win
'Win10 Tests x64 (dbg)', 'Win7 Tests (1)', # For swarming capacity reasons.
'Win10 Tests x64 (dbg)', # Matches browser_tests.
], ],
}, },
'network_service_components_browsertests': { 'network_service_components_browsertests': {
'remove_from': [ 'remove_from': [
# chromium.win # chromium.win
'Win10 Tests x64 (dbg)', 'Win7 Tests (1)', # For swarming capacity reasons.
'Win10 Tests x64 (dbg)', # Matches components_browsertests.
],
},
'network_service_content_browsertests': {
'remove_from': [
# chromium.win
'Win7 Tests (1)', # For swarming capacity reasons.
], ],
}, },
'network_service_extensions_browsertests': { 'network_service_extensions_browsertests': {
'remove_from': [ 'remove_from': [
# chromium.win # chromium.win
'Win10 Tests x64 (dbg)', 'Win7 Tests (1)', # For swarming capacity reasons.
'Win10 Tests x64 (dbg)', # Matches extensions_browsertests.
], ],
}, },
'network_service_interactive_ui_tests': { 'network_service_interactive_ui_tests': {
'remove_from': [
# chromium.win
'Win7 Tests (1)', # For swarming capacity reasons.
],
'modifications': { 'modifications': {
# chromium.win; temporary, https://crbug.com/818832 # chromium.win
'Win10 Tests x64 (dbg)': { 'Win10 Tests x64 (dbg)': { # temporary, https://crbug.com/818832
'experiment_percentage': 100, 'experiment_percentage': 100,
}, },
}, },
......
testing/buildbot/test_suites.pyl
View file @ 17d2fcdd
...@@ -2556,20 +2556,7 @@ ...@@ -2556,20 +2556,7 @@
'vr_platform_specific_chromium_gtests', 'vr_platform_specific_chromium_gtests',
], ],
'chromium_win7_gtests': [ 'chromium_win_gtests': [
'aura_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'non_android_chromium_gtests',
'non_android_and_cast_and_chromeos_chromium_gtests',
'non_linux_chromium_gtests',
'non_mac_chromium_gtests',
'viz_gtests',
'vr_platform_specific_chromium_gtests',
'win_specific_chromium_gtests',
],
'chromium_win10_gtests': [
'aura_gtests', 'aura_gtests',
'chromium_gtests', 'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output', 'chromium_gtests_for_devices_with_graphical_output',
......
testing/buildbot/waterfalls.pyl
View file @ 17d2fcdd
...@@ -531,7 +531,7 @@ ...@@ -531,7 +531,7 @@
}, },
'CrWinAsan': { 'CrWinAsan': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
...@@ -543,7 +543,7 @@ ...@@ -543,7 +543,7 @@
}, },
'CrWinAsan(dll)': { 'CrWinAsan(dll)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
...@@ -555,7 +555,7 @@ ...@@ -555,7 +555,7 @@
}, },
'CrWinAsanCov': { 'CrWinAsanCov': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
'swarming': { 'swarming': {
'dimension_sets': [ 'dimension_sets': [
...@@ -567,22 +567,22 @@ ...@@ -567,22 +567,22 @@
}, },
'CrWinClangLLD': { 'CrWinClangLLD': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'CrWinClangLLD64': { 'CrWinClangLLD64': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'CrWinClngLLD64dbg': { 'CrWinClngLLD64dbg': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'CrWinClngLLDdbg': { 'CrWinClngLLDdbg': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTAndroid': { 'ToTAndroid': {
...@@ -698,52 +698,52 @@ ...@@ -698,52 +698,52 @@
}, },
'ToTWin': { 'ToTWin': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWin(dbg)': { 'ToTWin(dbg)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWin(dll)': { 'ToTWin(dll)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWin64': { 'ToTWin64': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWin64(dbg)': { 'ToTWin64(dbg)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWin64(dll)': { 'ToTWin64(dll)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWinCFI': { 'ToTWinCFI': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWinCFI64': { 'ToTWinCFI64': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWinLibcxx64': { 'ToTWinLibcxx64': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'ToTWinThinLTO64': { 'ToTWinThinLTO64': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'linux-win_cross-rel': { 'linux-win_cross-rel': {
...@@ -755,7 +755,7 @@ ...@@ -755,7 +755,7 @@
], ],
}, },
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'UBSanVptr Linux': { 'UBSanVptr Linux': {
...@@ -2356,7 +2356,7 @@ ...@@ -2356,7 +2356,7 @@
}, },
'Out of Process Profiling Windows': { 'Out of Process Profiling Windows': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
}, },
'Site Isolation Android': { 'Site Isolation Android': {
...@@ -2447,7 +2447,7 @@ ...@@ -2447,7 +2447,7 @@
}, },
'Win 10 Fast Ring': { 'Win 10 Fast Ring': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win10_gtests', 'gtest_tests': 'chromium_win_gtests',
}, },
'use_swarming': False, 'use_swarming': False,
}, },
...@@ -3199,13 +3199,13 @@ ...@@ -3199,13 +3199,13 @@
}, },
'Win 7 Tests x64 (1)': { 'Win 7 Tests x64 (1)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
'isolated_scripts': 'chromium_rel_isolated_scripts', 'isolated_scripts': 'chromium_rel_isolated_scripts',
}, },
}, },
'Win10 Tests x64': { 'Win10 Tests x64': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win10_gtests', 'gtest_tests': 'chromium_win_gtests',
'isolated_scripts': 'win_specific_isolated_scripts', 'isolated_scripts': 'win_specific_isolated_scripts',
}, },
}, },
...@@ -3216,20 +3216,20 @@ ...@@ -3216,20 +3216,20 @@
}, },
'Win7 Tests (1)': { 'Win7 Tests (1)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
'isolated_scripts': 'chromium_rel_isolated_scripts', 'isolated_scripts': 'chromium_rel_isolated_scripts',
'scripts': 'chromium_scripts', 'scripts': 'chromium_scripts',
}, },
}, },
'Win7 Tests (dbg)(1)': { 'Win7 Tests (dbg)(1)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win7_gtests', 'gtest_tests': 'chromium_win_gtests',
'isolated_scripts': 'chromium_dbg_isolated_scripts', 'isolated_scripts': 'chromium_dbg_isolated_scripts',
}, },
}, },
'Win10 Tests x64 (dbg)': { 'Win10 Tests x64 (dbg)': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_win10_gtests', 'gtest_tests': 'chromium_win_gtests',
'isolated_scripts': 'chromium_dbg_isolated_scripts', 'isolated_scripts': 'chromium_dbg_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