Skip to content

GitLab

T
tangled
Commit 12363ccd authored by Nico Weber's avatar Nico Weber
Browse files
Options

Remove Site Isolation Linux, Site Isolation Win bots. 

src/ side

Bug: 863886
Change-Id: I4b5914a0e9fa12ab263d2586b08f8f4a23f7cba5
Reviewed-on: https://chromium-review.googlesource.com/1138334Reviewed-by: default avatarCharlie Reis <creis@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575314}
parent 9c0c0084
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 306 deletions
infra/config/global/cr-buildbucket-dev.cfg
View file @ 12363ccd
......@@ -159,7 +159,6 @@ buckets {
builders { mixins: "linux" name: "LUCI linux_nacl_sdk" }
builders { mixins: "linux" name: "LUCI linux_nacl_sdk_build" }
builders { mixins: "linux" name: "LUCI linux_optional_gpu_tests_rel" }
builders { mixins: "linux" name: "LUCI linux_site_isolation" }
builders { mixins: "linux" name: "LUCI linux_upload_clang" }
builders { mixins: "mac" name: "LUCI ios-device" }
......
infra/config/global/cr-buildbucket.cfg
View file @ 12363ccd
......@@ -1591,11 +1591,6 @@ buckets {
mixins: "fyi-ci"
mixins: "libfuzzer"
}
builders {
name: "Site Isolation Win"
dimensions: "os:Windows-10"
mixins: "fyi-ci"
}
builders {
name: "Mac ASan 64 Builder"
dimensions: "os:Mac-10.13"
......@@ -1760,11 +1755,6 @@ buckets {
dimensions: "os:Ubuntu-14.04"
mixins: "swarm-ci"
}
builders {
name: "Site Isolation Linux"
dimensions: "os:Ubuntu-14.04"
mixins: "fyi-ci"
}
builders {
name: "Win ASan Release"
dimensions: "os:Windows-10"
......@@ -2549,7 +2539,6 @@ buckets {
name: "linux_nacl_sdk_build"
}
builders { mixins: "linux-optional-gpu-try" name: "linux_optional_gpu_tests_rel" }
builders { mixins: "linux-try" name: "linux_site_isolation" }
builders {
mixins: "linux-try"
mixins: "upload_clang"
......
infra/config/global/luci-milo-dev.cfg
View file @ 12363ccd
......@@ -2105,14 +2105,6 @@ consoles: {
name: "buildbot/chromium.fyi/Site Isolation Android"
category: "site_isolation"
}
builders: {
name: "buildbot/chromium.fyi/Site Isolation Linux"
category: "site_isolation"
}
builders: {
name: "buildbot/chromium.fyi/Site Isolation Win"
category: "site_isolation"
}
builders: {
name: "buildbot/chromium.fyi/Linux Viz"
category: "viz"
......@@ -3574,9 +3566,6 @@ consoles: {
builders: {
name: "buildbot/tryserver.chromium.linux/linux_optional_gpu_tests_rel"
}
builders: {
name: "buildbot/tryserver.chromium.linux/linux_site_isolation"
}
builders: {
name: "buildbot/tryserver.chromium.linux/linux_upload_clang"
}
......
infra/config/global/luci-milo.cfg
View file @ 12363ccd
......@@ -2331,14 +2331,6 @@ consoles {
name: "buildbucket/luci.chromium.ci/Site Isolation Android"
category: "site_isolation"
}
builders {
name: "buildbucket/luci.chromium.ci/Site Isolation Linux"
category: "site_isolation"
}
builders {
name: "buildbucket/luci.chromium.ci/Site Isolation Win"
category: "site_isolation"
}
builders {
name: "buildbucket/luci.chromium.ci/linux-annotator-rel"
category: "network|traffic|annotations"
......@@ -2701,16 +2693,6 @@ consoles {
name: "buildbucket/luci.chromium.ci/Site Isolation Android"
category: "site_isolation"
}
builders {
name: "buildbot/chromium.fyi/Site Isolation Linux"
name: "buildbucket/luci.chromium.ci/Site Isolation Linux"
category: "site_isolation"
}
builders {
name: "buildbot/chromium.fyi/Site Isolation Win"
name: "buildbucket/luci.chromium.ci/Site Isolation Win"
category: "site_isolation"
}
builders {
name: "buildbot/chromium.fyi/linux-annotator-rel"
name: "buildbucket/luci.chromium.ci/linux-annotator-rel"
......@@ -4093,9 +4075,6 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/linux_optional_gpu_tests_rel"
}
builders {
name: "buildbucket/luci.chromium.try/linux_site_isolation"
}
builders {
name: "buildbot/tryserver.chromium.linux/linux_upload_clang"
name: "buildbucket/luci.chromium.try/linux_upload_clang"
......@@ -4757,9 +4736,6 @@ consoles {
builders {
name: "buildbucket/luci.chromium.try/linux_optional_gpu_tests_rel"
}
builders {
name: "buildbucket/luci.chromium.try/linux_site_isolation"
}
builders {
name: "buildbucket/luci.chromium.try/linux_upload_clang"
}
......
infra/config/global/luci-scheduler.cfg
View file @ 12363ccd
......@@ -181,8 +181,6 @@ trigger {
triggers: "Mojo Windows"
triggers: "Optional Android Release (Nexus 5X)"
triggers: "Site Isolation Android"
triggers: "Site Isolation Linux"
triggers: "Site Isolation Win"
triggers: "TSAN Debug"
triggers: "TSAN Release"
triggers: "UBSan Release"
......@@ -3157,26 +3155,6 @@ job {
}
}
job {
id: "Site Isolation Linux"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "Site Isolation Linux"
}
}
job {
id: "Site Isolation Win"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "Site Isolation Win"
}
}
job {
id: "TSAN Debug"
acl_sets: "default"
......
testing/buildbot/chromium.fyi.json
View file @ 12363ccd
......@@ -1826,139 +1826,6 @@
}
]
},
"Site Isolation Linux": {
"additional_compile_targets": [
"base_unittests"
]
},
"Site Isolation Win": {
"gtest_tests": [
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "app_shell_unittests"
},
{
"args": [
"--site-per-process"
],
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"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"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"integrity": "high"
}
]
},
"test": "installer_util_unittests"
},
{
"args": [
"--site-per-process"
],
"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"
}
]
},
"VR Linux": {
"additional_compile_targets": [
"vr_common_perftests",
......
testing/buildbot/test_suites.pyl
View file @ 12363ccd
......@@ -2051,89 +2051,6 @@
},
},
'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
# unified.
'app_shell_unittests': {
'args': [
'--site-per-process',
],
},
'browser_tests': {
'args': [
'--site-per-process'
],
'swarming': {
'shards': 10,
},
},
'components_browsertests': {
'args': [
'--site-per-process',
],
},
'components_unittests': {
'args': [
'--site-per-process',
],
},
'content_browsertests': {
'args': [
'--site-per-process',
'--test-launcher-filter-file=../../testing/buildbot/filters/site-per-process.content_browsertests.filter',
],
},
'content_unittests': {
'args': [
'--site-per-process',
],
},
'extensions_browsertests': {
'args': [
'--site-per-process',
],
},
'extensions_unittests': {
'args': [
'--site-per-process',
],
},
'interactive_ui_tests': {
'args': [
'--site-per-process',
],
},
'installer_util_unittests': {
'args': [
'--site-per-process',
],
'swarming': {
'dimension_sets': [
{
'integrity': 'high',
}
],
},
},
'nacl_loader_unittests': {
'args': [
'--site-per-process',
],
},
'sync_integration_tests': {
'args': [
'--site-per-process',
],
},
'unit_tests': {
'args': [
'--site-per-process',
],
},
},
'system_webview_shell_instrumentation_tests': {
'system_webview_shell_layout_test_apk': {},
},
......
testing/buildbot/waterfalls.pyl
View file @ 12363ccd
......@@ -2490,24 +2490,6 @@
'gtest_tests': 'site_isolation_android_fyi_gtests',
},
},
'Site Isolation Linux': {
# TODO(lukasza, dpranke): Remove this bot once site-per-process has
# been turned on by default for a while (e.g. once
# https://crrev.com/c/981019 "sticks").
# base_unittests is a placeholder
# to keep the builder from building "all".
'additional_compile_targets': [
'base_unittests',
],
},
'Site Isolation Win': {
# TODO(lukasza, dpranke): Remove this bot once site-per-process has
# been turned on by default for a while (e.g. once
# https://crrev.com/c/981019 "sticks").
'test_suites': {
'gtest_tests': 'site_isolation_win_fyi_gtests',
},
},
'VR Linux': {
'additional_compile_targets': [
'vr_common_perftests',
......
tools/mb/mb_config.pyl
View file @ 12363ccd
......@@ -226,8 +226,6 @@
'Mojo Linux': 'release_trybot',
'Mojo Windows': 'release_bot_x86_minimal_symbols',
'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64',
'Site Isolation Linux': 'release_trybot',
'Site Isolation Win': 'release_trybot_x86',
'VR Linux': 'vr_release_bot',
'Win 10 Fast Ring': 'release_trybot',
'Windows deterministic': 'release_bot_x86_minimal_symbols',
......@@ -632,7 +630,6 @@
'linux_nacl_sdk': 'release_bot',
'linux_nacl_sdk_build': 'release_bot',
'linux_optional_gpu_tests_rel': 'gpu_fyi_tests_release_trybot',
'linux_site_isolation': 'release_trybot',
'linux_upload_clang': 'release_bot',
'linux_vr': 'vr_release_trybot',
},
......
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