Skip to content

GitLab

T
tangled
Commit 7feb880d authored by Dirk Pranke's avatar Dirk Pranke Committed by Commit Bot
Browse files
Options

Add remaining site_per_process test suites to main Linux bots. 

This CL adds
  - site_per_process_components_browsertests
  - site_per_process_components_unittests
  - site_per_process_content_browsertests
  - site_per_process_content_unittests
  - site_per_process_extensions_browsertests
  - site_per_process_extensions_unittests
  - site_per_process_interactive_ui_tests
  - site_per_process_sync_integration_tests

to the Linux Tests and Linux Tests (dbg)(1) builders; this will
also add them to linux_chromium_rel_ng in the CQ. This CL also
removes these tests from the "Linux Site Isolation" builder on
chromium.fyi.

R=jam@chromium.org, creis@chromium.org, jbudorick@chromium.org
BUG=786554

Change-Id: I5b26655138a0120e17a88e1f6aee1ae73cbb8571
Reviewed-on: https://chromium-review.googlesource.com/821554Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Reviewed-by: default avatarAlex Moshchuk <alexmos@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524141}
parent af82ecb2
Hide whitespace changes
Inline Side-by-side
Showing with 267 additions and 169 deletions
testing/buildbot/chromium.fyi.json
View file @ 7feb880d
......@@ -6132,119 +6132,8 @@
]
},
"Site Isolation Linux": {
"gtest_tests": [
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "app_shell_unittests"
},
{
"args": [
"--site-per-process",
"--test-launcher-filter-file=../../testing/buildbot/filters/site-per-process.browser_tests.filter"
],
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 5
},
"test": "browser_tests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_unittests"
},
{
"args": [
"--site-per-process",
"--test-launcher-filter-file=../../testing/buildbot/filters/site-per-process.content_browsertests.filter"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_unittests"
},
{
"args": [
"--site-per-process",
"--test-launcher-filter-file=../../testing/buildbot/filters/site-per-process.interactive_ui_tests.filter"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "interactive_ui_tests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "nacl_loader_unittests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "sync_integration_tests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "unit_tests"
}
"additional_compile_targets": [
"base_unittests"
],
"isolated_scripts": [
{
......@@ -6263,7 +6152,7 @@
],
"script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
},
"name": "webkit_layout_tests",
"name": "site_per_process_webkit_layout_tests",
"results_handler": "layout tests",
"swarming": {
"can_use_on_swarming_builders": true,
......
testing/buildbot/chromium.linux.json
View file @ 7feb880d
......@@ -587,12 +587,32 @@
},
"test": "components_browsertests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_unittests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_components_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -700,12 +720,32 @@
},
"test": "extensions_browsertests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_unittests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_extensions_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -772,6 +812,16 @@
},
"test": "interactive_ui_tests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "interactive_ui_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -934,6 +984,16 @@
},
"test": "sync_integration_tests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_sync_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "sync_integration_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
......@@ -1212,12 +1272,32 @@
},
"test": "components_browsertests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_unittests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_components_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1313,12 +1393,32 @@
},
"test": "extensions_browsertests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_unittests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_extensions_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1386,6 +1486,16 @@
},
"test": "interactive_ui_tests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "interactive_ui_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -1551,6 +1661,16 @@
},
"test": "sync_integration_tests"
},
{
"args": [
"--site-per-process"
],
"name": "site_per_process_sync_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "sync_integration_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 7feb880d
......@@ -3361,8 +3361,25 @@
},
},
},
'site_per_process_components_browsertests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
# chromium.sandbox
'Linux Tests SANDBOX',
],
},
'site_per_process_components_unittests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
# chromium.sandbox
'Linux Tests SANDBOX',
],
},
'site_per_process_content_browsertests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
],
'modifications': {
......@@ -3379,7 +3396,40 @@
},
'site_per_process_content_unittests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
],
},
'site_per_process_extensions_browsertests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
# chromium.sandbox
'Linux Tests SANDBOX',
],
},
'site_per_process_extensions_unittests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
# chromium.sandbox
'Linux Tests SANDBOX',
],
},
'site_per_process_interactive_ui_tests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
# chromium.sandbox
'Linux Tests SANDBOX',
],
},
'site_per_process_sync_integration_tests': {
'remove_from': [
# chromium.linux
'Linux Tests (dbg)(1)(32)',
# chromium.sandbox
'Linux Tests SANDBOX',
],
},
'site_per_process_unit_tests': {
......
testing/buildbot/test_suites.pyl
View file @ 7feb880d
......@@ -1272,6 +1272,38 @@
'devtools_eslint': {},
},
'linux_specific_site_per_process_isolated_scripts': {
# TODO(crbug.com/786554): merge this into
# linux_specific_chromium_isolated_scripts to run on
# linux_chromium_rel_ng when we're sure we have the capacity.
'site_per_process_webkit_layout_tests': {
'args': [
'--additional-driver-flag',
'--site-per-process',
'--additional-driver-flag',
'--isolate-origins=http://www.web-platform.test:8001/,http://www1.web-platform.test:8001/,http://www2.web-platform.test:8001/,http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8001/,http://xn--lve-6lad.web-platform.test:8001/,http://www.web-platform.test:8081/,http://www1.web-platform.test:8081/,http://www2.web-platform.test:8081/,http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8081/,http://xn--lve-6lad.web-platform.test:8081/,https://www.web-platform.test:8444/,https://www1.web-platform.test:8444/,https://www2.web-platform.test:8444/,https://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8444/,https://xn--lve-6lad.web-platform.test:8444/',
'--additional-expectations',
'src/third_party/WebKit/LayoutTests/FlagExpectations/site-per-process',
],
'isolate_name': 'webkit_layout_tests_exparchive',
'merge': {
'args': [
'--verbose',
],
'script': '//third_party/WebKit/Tools/Scripts/merge-layout-test-results',
},
'results_handler': 'layout tests',
'swarming': {
'dimension_sets': [
{
'os': 'Ubuntu-14.04'
},
],
'shards': 10,
},
},
},
'mac_specific_chromium_gtests': {
'mac_installer_unittests': {},
'sandbox_mac_unittests': {},
......@@ -1493,6 +1525,45 @@
},
},
'site_isolation_chromium_linux_gtests': {
'site_per_process_components_browsertests': {
'args': [
'--site-per-process',
],
'test': 'components_browsertests',
},
'site_per_process_components_unittests': {
'args': [
'--site-per-process',
],
'test': 'components_unittests',
},
'site_per_process_extensions_browsertests': {
'args': [
'--site-per-process',
],
'test': 'extensions_browsertests',
},
'site_per_process_extensions_unittests': {
'args': [
'--site-per-process',
],
'test': 'extensions_unittests',
},
'site_per_process_interactive_ui_tests': {
'args': [
'--site-per-process',
],
'test': 'interactive_ui_tests',
},
'site_per_process_sync_integration_tests': {
'args': [
'--site-per-process',
],
'test': 'sync_integration_tests',
},
},
'site_isolation_android_fyi_specific_gtests': {
# TODO(kbr): a couple of these look like accidents.
# content_browsertests and content_unittests are already run on
......@@ -1517,7 +1588,7 @@
},
},
'site_isolation_linux_and_win_fyi_gtests': {
'site_isolation_win_fyi_gtests': {
# TODO(kbr): most of the tests on this bot have different names
# than the other site isolation bots, so we can't simply reuse the
# site_isolation_chromium_gtests test suite. These should be
......@@ -1572,64 +1643,32 @@
'--site-per-process',
],
},
'nacl_loader_unittests': {
'installer_util_unittests': {
'args': [
'--site-per-process',
],
'swarming': {
'dimension_sets': [
{
'integrity': 'high',
}
],
},
},
'sync_integration_tests': {
'nacl_loader_unittests': {
'args': [
'--site-per-process',
],
},
'unit_tests': {
'sync_integration_tests': {
'args': [
'--site-per-process',
],
},
},
'site_isolation_linux_fyi_isolated_scripts': {
'webkit_layout_tests': {
'args': [
'--additional-driver-flag',
'--site-per-process',
'--additional-driver-flag',
'--isolate-origins=http://www.web-platform.test:8001/,http://www1.web-platform.test:8001/,http://www2.web-platform.test:8001/,http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8001/,http://xn--lve-6lad.web-platform.test:8001/,http://www.web-platform.test:8081/,http://www1.web-platform.test:8081/,http://www2.web-platform.test:8081/,http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8081/,http://xn--lve-6lad.web-platform.test:8081/,https://www.web-platform.test:8444/,https://www1.web-platform.test:8444/,https://www2.web-platform.test:8444/,https://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8444/,https://xn--lve-6lad.web-platform.test:8444/',
'--additional-expectations',
'src/third_party/WebKit/LayoutTests/FlagExpectations/site-per-process',
],
'isolate_name': 'webkit_layout_tests_exparchive',
'merge': {
'args': [
'--verbose',
],
'script': '//third_party/WebKit/Tools/Scripts/merge-layout-test-results',
},
'results_handler': 'layout tests',
'swarming': {
'dimension_sets': [
{
'os': 'Ubuntu-14.04'
},
],
'shards': 10,
},
},
},
'site_isolation_win_fyi_specific_gtests': {
'installer_util_unittests': {
'unit_tests': {
'args': [
'--site-per-process',
],
'swarming': {
'dimension_sets': [
{
'integrity': 'high',
}
],
},
},
},
......@@ -1895,6 +1934,7 @@
'non_clang_win_chromium_gtests',
'non_mac_non_clang_win_chromium_gtests',
'site_isolation_chromium_gtests',
'site_isolation_chromium_linux_gtests',
'viz_gtests',
],
......@@ -2234,15 +2274,6 @@
'site_isolation_chromium_gtests',
],
'site_isolation_linux_fyi_gtests': [
'site_isolation_linux_and_win_fyi_gtests',
],
'site_isolation_win_fyi_gtests': [
'site_isolation_linux_and_win_fyi_gtests',
'site_isolation_win_fyi_specific_gtests',
],
'system_webview_and_webview_ui_instrumentation_tests': [
'system_webview_shell_instrumentation_tests',
'webview_ui_instrumentation_tests',
......
testing/buildbot/waterfalls.pyl
View file @ 7feb880d
......@@ -1204,9 +1204,17 @@
},
},
'Site Isolation Linux': {
# TODO(dpranke): Remove this builder once the tests are running on
# the main 'Linux Tests' bot; base_unittests is a placeholder
# to keep the builder from building "all".
'additional_compile_targets': [
'base_unittests',
],
'test_suites': {
'gtest_tests': 'site_isolation_linux_fyi_gtests',
'isolated_scripts': 'site_isolation_linux_fyi_isolated_scripts',
# TODO(crbug.com/786554): merge this into
# linux_specific_chromium_isolated_scripts to run on
# linux_chromium_rel_ng when we're sure we have the capacity.
'isolated_scripts': 'linux_specific_site_per_process_isolated_scripts',
},
},
'Site Isolation Win': {
......
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