Skip to content

GitLab

T
tangled
Commit 81928eb2 authored by Patrik Höglund's avatar Patrik Höglund Committed by Commit Bot
Browse files
Options

Configure chromium.webrtc test suites. 

This should make the chromium.webrtc waterfall work like the old
test config in recipes. It incorporates some fixes made in the
recipe code and creates composite test suites for the chromium.webrtc
bots.

Bug: 877018
Change-Id: I11b91c4e9516844086978b5a63b816576197585b
Reviewed-on: https://chromium-review.googlesource.com/c/1280669Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599947}
parent 43b75585
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 679 additions and 201 deletions
testing/buildbot/chromium.webrtc.experimental.json deleted 100644 → 0
View file @ 43b75585
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"Linux Builder": {
"gtest_tests": [
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
"--run-manual",
"--ui-test-action-max-timeout=350000",
"--test-launcher-jobs=1",
"--test-launcher-bot-mode",
"--test-launcher-print-test-stdio=always",
"--results-url=https://chromeperf.appspot.com",
"--perf-dashboard-id=browser_tests",
"--annotate=graphing",
"--perf-id=${buildername}-experimental"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "browser_tests"
},
{
"args": [
"--enable-logging",
"--v=1",
"--test-launcher-jobs=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "capture_unittests"
},
{
"args": [
"--gtest_filter=UsingRealWebcam*",
"--run-manual",
"--test-launcher-jobs=1"
],
"name": "content_browsertests_sequential",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
}
]
},
"Mac Builder": {
"gtest_tests": [
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
"--run-manual",
"--ui-test-action-max-timeout=350000",
"--test-launcher-jobs=1",
"--test-launcher-bot-mode",
"--test-launcher-print-test-stdio=always",
"--results-url=https://chromeperf.appspot.com",
"--perf-dashboard-id=browser_tests",
"--annotate=graphing",
"--perf-id=${buildername}-experimental"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "browser_tests"
},
{
"args": [
"--enable-logging",
"--v=1",
"--test-launcher-jobs=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "capture_unittests"
},
{
"args": [
"--gtest_filter=UsingRealWebcam*",
"--run-manual",
"--test-launcher-jobs=1"
],
"name": "content_browsertests_sequential",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
}
]
},
"Win Builder": {
"gtest_tests": [
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_perf.browser_tests.filter",
"--run-manual",
"--ui-test-action-max-timeout=350000",
"--test-launcher-jobs=1",
"--test-launcher-bot-mode",
"--test-launcher-print-test-stdio=always",
"--results-url=https://chromeperf.appspot.com",
"--perf-dashboard-id=browser_tests",
"--annotate=graphing",
"--perf-id=${buildername}-experimental"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "browser_tests"
},
{
"args": [
"--enable-logging",
"--v=1",
"--test-launcher-jobs=1",
"--test-launcher-print-test-stdio=always"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "capture_unittests"
},
{
"args": [
"--gtest_filter=UsingRealWebcam*",
"--run-manual",
"--test-launcher-jobs=1"
],
"name": "content_browsertests_sequential",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
}
]
}
}
testing/buildbot/chromium.webrtc.json
View file @ 81928eb2
This diff is collapsed.
testing/buildbot/test_suites.pyl
View file @ 81928eb2
......@@ -2269,24 +2269,17 @@
},
},
'webrtc_chromium_android_gtests': {
'content_browsertests': {
'args': ['--gtest_filter=WebRtc*'],
},
},
'webrtc_chromium_baremetal_gtests': {
'content_browsertests_sequential': {
# These run a few tests that require webcam access. They need to
# run sequentially, otherwise tests may interfere with each other.
'args': ['--gtest_filter=UsingRealWebcam*', '--run-manual',
'--test-launcher-jobs=1'],
'test': 'content_browsertests',
},
# Run capture unittests as well since our bots have real webcams.
'capture_unittests': {
'args': ['--enable-logging', '--v=1', '--test-launcher-jobs=1',
'--test-launcher-print-test-stdio=always'],
'args': ['--enable-logging', '--v=1', '--test-launcher-jobs=1',
'--test-launcher-print-test-stdio=always',
# TODO(crbug.com/893494): Remove once real webcams are fixed
# on chromium.webrtc Mac and Win bots.
'--gtest_filter=-*UsingRealWebcam*'],
'swarming': {
'can_use_on_swarming_builders': False,
},
},
'browser_tests': {
'args': [
......@@ -2299,12 +2292,13 @@
'--results-url=https://chromeperf.appspot.com',
'--perf-dashboard-id=browser_tests',
'--annotate=graphing',
# TODO(phoglund): this means we're uploading to the real dashboard, but
# tag on -experimental to the name to make it obvious to perf sheriffs.
'--perf-id=${buildername}-experimental',
'--perf-id=${buildername}',
# TODO(phoglund): figure out if we need this and implement webrtc_got_rev in that case.
# '--perf-config={"a_default_rev": "r_webrtc_git", "r_webrtc_git":${webrtc_got_rev}}',
]
],
'swarming': {
'can_use_on_swarming_builders': False,
},
},
},
......@@ -2350,6 +2344,25 @@
},
},
'webrtc_chromium_simple_baremetal_gtests': {
'content_browsertests_sequential': {
# These run a few tests that require webcam access. They need to
# run sequentially, otherwise tests may interfere with each other.
'args': ['--gtest_filter=UsingRealWebcam*', '--run-manual',
'--test-launcher-jobs=1'],
'test': 'content_browsertests',
'swarming': {
'can_use_on_swarming_builders': False,
},
},
},
'webrtc_chromium_simple_gtests': {
'content_browsertests': {
'args': ['--gtest_filter=WebRtc*'],
},
},
'webview_cts_tests_isolated_scripts': {
'webview_cts_tests': {
'swarming': {
......@@ -2868,5 +2881,17 @@
'system_webview_shell_instrumentation_tests',
'webview_ui_instrumentation_tests',
],
'webrtc_android_tests_with_baremetal_tests': [
'webrtc_chromium_simple_baremetal_gtests',
'webrtc_chromium_simple_gtests',
],
'webrtc_chromium_tests_with_baremetal_tests': [
'webrtc_chromium_baremetal_gtests',
'webrtc_chromium_gtests',
'webrtc_chromium_simple_gtests',
'webrtc_chromium_simple_baremetal_gtests',
],
}
}
testing/buildbot/waterfalls.pyl
View file @ 81928eb2
......@@ -3477,60 +3477,59 @@
{
'name': 'chromium.webrtc',
'machines': {
'Android Builder': {},
'Android Tester': {
'test_suites': {
'gtest_tests': 'webrtc_android_tests_with_baremetal_tests',
},
},
'Linux Builder': {
'additional_compile_targets': [
'browser_tests',
'capture_unittests',
'content_browsertests',
'content_unittests',
'frame_analyzer',
'jingle_unittests',
'remoting_unittests',
],
},
'Linux Tester': {
'test_suites': {
'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
},
},
'Mac Builder': {
'additional_compile_targets': [
'browser_tests',
'capture_unittests',
'content_browsertests',
'content_unittests',
'frame_analyzer',
'jingle_unittests',
'remoting_unittests',
],
},
'Mac Tester': {
'test_suites': {
'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
},
},
'Mac Tester (long-running)': {},
'Win Builder': {
'additional_compile_targets': [
'browser_tests',
'capture_unittests',
'content_browsertests',
'content_unittests',
'frame_analyzer',
'jingle_unittests',
'remoting_unittests',
],
},
},
},
{
'name': 'chromium.webrtc.experimental',
'machines': {
'Linux Builder': {
'Win10 Tester': {
'test_suites': {
'gtest_tests': 'webrtc_chromium_gtests',
'gtest_tests': 'webrtc_chromium_baremetal_gtests',
'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
},
},
'Mac Builder': {
'Win7 Tester': {
'test_suites': {
'gtest_tests': 'webrtc_chromium_gtests',
'gtest_tests': 'webrtc_chromium_baremetal_gtests',
'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
},
},
'Win Builder': {
# TODO(crbug.com/877018): delete long-running bots.
'Win7 Tester (long-running)': {},
'Win8 Tester': {
'test_suites': {
'gtest_tests': 'webrtc_chromium_gtests',
'gtest_tests': 'webrtc_chromium_baremetal_gtests',
'gtest_tests': 'webrtc_chromium_tests_with_baremetal_tests',
},
},
},
......@@ -3558,7 +3557,7 @@
'hammerhead',
],
'test_suites': {
'gtest_tests': 'webrtc_chromium_android_gtests',
'gtest_tests': 'webrtc_chromium_simple_gtests',
},
},
'WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)': {
......@@ -3567,7 +3566,7 @@
'bullhead',
],
'test_suites': {
'gtest_tests': 'webrtc_chromium_android_gtests',
'gtest_tests': 'webrtc_chromium_simple_gtests',
},
},
'WebRTC Chromium FYI Linux Builder': {
......
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