Skip to content

GitLab

T
tangled
Commit 180edf07 authored by jonross's avatar jonross Committed by Commit Bot
Browse files
Options

Get Viz back on FYI bots 

We had originally removed viz_content_browsertests and viz_content_unittests
from Windows, Linux, Mac, and Android FYI bots. This was as we entered Finch
trials and field configurations began to enable this on the CQ.

However we have found out that this only affects test suites withing
chrome/browser. So we lost coverage of content tests.

This re-adds viz_content_browsertests, and viz_content_unittests to the FYI bots
so that we can see if anything is broken.

Change-Id: Ifcb2aab687276b82ec68c9e730aa27cf4ab4b0fc
Reviewed-on: https://chromium-review.googlesource.com/c/1327565Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607037}
parent 6dbdf88e
Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 15 deletions
testing/buildbot/chromium.fyi.json
View file @ 180edf07
...@@ -492,6 +492,17 @@ ...@@ -492,6 +492,17 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "content_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -508,6 +519,16 @@ ...@@ -508,6 +519,16 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -1071,6 +1092,17 @@ ...@@ -1071,6 +1092,17 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--disable-features=VizDisplayCompositor" "--disable-features=VizDisplayCompositor"
...@@ -1080,6 +1112,16 @@ ...@@ -1080,6 +1112,16 @@
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
}, },
"test": "content_unittests" "test": "content_unittests"
},
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
} }
] ]
}, },
...@@ -1458,6 +1500,53 @@ ...@@ -1458,6 +1500,53 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"viz_content_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead",
"os": "Android"
}
],
"hard_timeout": 3600,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 10
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=NetworkService", "--enable-features=NetworkService",
...@@ -1867,6 +1956,17 @@ ...@@ -1867,6 +1956,17 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--disable-features=VizDisplayCompositor" "--disable-features=VizDisplayCompositor"
...@@ -1877,6 +1977,16 @@ ...@@ -1877,6 +1977,16 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{ {
"args": [ "args": [
"--enable-features=NetworkService" "--enable-features=NetworkService"
...@@ -3094,6 +3204,52 @@ ...@@ -3094,6 +3204,52 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor",
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"viz_content_browsertests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
],
"shards": 10
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=NetworkService", "--enable-features=NetworkService",
...@@ -7781,6 +7937,24 @@ ...@@ -7781,6 +7937,24 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.14"
}
],
"expiration": 21600,
"shards": 10
},
"test": "content_browsertests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
...@@ -7811,6 +7985,23 @@ ...@@ -7811,6 +7985,23 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.14"
}
],
"expiration": 21600
},
"test": "content_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
...@@ -8957,6 +9148,17 @@ ...@@ -8957,6 +9148,17 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor,ViewsBrowserWindows"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=ViewsBrowserWindows" "--enable-features=ViewsBrowserWindows"
...@@ -8977,6 +9179,16 @@ ...@@ -8977,6 +9179,16 @@
}, },
"test": "content_unittests" "test": "content_unittests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor,ViewsBrowserWindows"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{ {
"args": [ "args": [
"--enable-features=ViewsBrowserWindows" "--enable-features=ViewsBrowserWindows"
......
testing/buildbot/test_suites.pyl
View file @ 180edf07
...@@ -2265,6 +2265,15 @@ ...@@ -2265,6 +2265,15 @@
}, },
}, },
'viz_chromeos_fyi_gtests': {
'viz_interactive_ui_tests': {
'args': [
'--enable-features=VizDisplayCompositor',
],
'test': 'interactive_ui_tests',
},
},
'viz_chromeos_gtests': { 'viz_chromeos_gtests': {
# TODO(jonross): remove once Viz field trials for ChromeOS are enabled. # TODO(jonross): remove once Viz field trials for ChromeOS are enabled.
'viz_browser_tests': { 'viz_browser_tests': {
...@@ -2297,27 +2306,12 @@ ...@@ -2297,27 +2306,12 @@
}, },
'viz_non_android_fyi_gtests': { 'viz_non_android_fyi_gtests': {
'viz_browser_tests': {
'args': [
'--enable-features=VizDisplayCompositor',
],
'swarming': {
'shards': 10,
},
'test': 'browser_tests',
},
'viz_content_unittests': { 'viz_content_unittests': {
'args': [ 'args': [
'--enable-features=VizDisplayCompositor', '--enable-features=VizDisplayCompositor',
], ],
'test': 'content_unittests', 'test': 'content_unittests',
}, },
'viz_interactive_ui_tests': {
'args': [
'--enable-features=VizDisplayCompositor',
],
'test': 'interactive_ui_tests',
},
}, },
'vr_platform_specific_chromium_gtests': { 'vr_platform_specific_chromium_gtests': {
...@@ -2620,6 +2614,8 @@ ...@@ -2620,6 +2614,8 @@
'non_linux_chromium_gtests', 'non_linux_chromium_gtests',
'non_viz_fyi_chromium_gtests', 'non_viz_fyi_chromium_gtests',
'non_viz_non_android_fyi_chromium_gtests', 'non_viz_non_android_fyi_chromium_gtests',
'viz_gtests',
'viz_non_android_fyi_gtests',
], ],
'chromium_mac_gtests': [ 'chromium_mac_gtests': [
...@@ -2934,6 +2930,8 @@ ...@@ -2934,6 +2930,8 @@
'linux_viz_gtests': [ 'linux_viz_gtests': [
'non_viz_fyi_chromium_gtests', 'non_viz_fyi_chromium_gtests',
'non_viz_non_android_fyi_chromium_gtests', 'non_viz_non_android_fyi_chromium_gtests',
'viz_gtests',
'viz_non_android_fyi_gtests',
], ],
'marshmallow_isolated_scripts': [ 'marshmallow_isolated_scripts': [
...@@ -2945,6 +2943,7 @@ ...@@ -2945,6 +2943,7 @@
'mojo_android_gtests': [ 'mojo_android_gtests': [
'network_service_android_gtests', 'network_service_android_gtests',
'non_viz_fyi_chromium_gtests', 'non_viz_fyi_chromium_gtests',
'viz_gtests',
], ],
'mojo_chromiumos_fyi_gtests': [ 'mojo_chromiumos_fyi_gtests': [
...@@ -2952,6 +2951,8 @@ ...@@ -2952,6 +2951,8 @@
'mash_fyi_chromium_gtests', 'mash_fyi_chromium_gtests',
'mojo_chromiumos_specific_gtests', 'mojo_chromiumos_specific_gtests',
'network_service_chromeos_fyi_gtests', 'network_service_chromeos_fyi_gtests',
'viz_chromeos_fyi_gtests',
'viz_chromeos_gtests',
'viz_gtests', 'viz_gtests',
'viz_non_android_fyi_gtests', 'viz_non_android_fyi_gtests',
], ],
...@@ -2961,6 +2962,8 @@ ...@@ -2961,6 +2962,8 @@
'network_service_gtests', 'network_service_gtests',
'non_viz_fyi_chromium_gtests', 'non_viz_fyi_chromium_gtests',
'non_viz_non_android_fyi_chromium_gtests', 'non_viz_non_android_fyi_chromium_gtests',
'viz_gtests',
'viz_non_android_fyi_gtests',
], ],
'sandboxed_chromium_memory_linux_gtests': [ 'sandboxed_chromium_memory_linux_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