Commit bf4c89d9 authored by Vlad Tsyrklevich's avatar Vlad Tsyrklevich Committed by Commit Bot

CFI: Delete icall buildbot

cfi-icall is now enabled on all of the CFI bots so a separate bot is no
longer required.

Bug: 874112
Change-Id: I4d3b066c8622e03f1085d06a3ea1c638e22c960e
Reviewed-on: https://chromium-review.googlesource.com/1174912
Commit-Queue: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583342}
parent 06aa0e18
{ {
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {},
"CFI Linux (icall)": {
"gtest_tests": [
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "accessibility_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "angle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "app_shell_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "aura_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "base_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "blink_common_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "blink_fuzzer_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "blink_heap_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "blink_platform_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "boringssl_crypto_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "boringssl_ssl_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"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": 15
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=WebUIPolymer2",
"--test-launcher-filter-file=../../testing/buildbot/filters/webui_polymer2_browser_tests.filter"
],
"name": "webui_polymer2_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "browser_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cacheinvalidation_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "capture_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cast_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cc_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "chrome_app_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "chromedriver_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_browsertests"
},
{
"args": [
"--disable-site-isolation-trials"
],
"name": "not_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": [
"--disable-site-isolation-trials"
],
"name": "not_site_per_process_components_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "components_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "compositor_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"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,
"shards": 2
},
"test": "content_browsertests"
},
{
"args": [
"--disable-site-isolation-trials"
],
"name": "not_site_per_process_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*"
],
"name": "perfetto_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "content_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{
"args": [
"--disable-site-isolation-trials"
],
"name": "not_site_per_process_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "cronet_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "crypto_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "dbus_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "device_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "display_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "events_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_browsertests"
},
{
"args": [
"--disable-site-isolation-trials"
],
"name": "not_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": [
"--disable-site-isolation-trials"
],
"name": "not_site_per_process_extensions_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "extensions_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "filesystem_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gcm_unit_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gfx_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gin_unittests"
},
{
"args": [
"--use-gpu-in-tests",
"--no-xvfb"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
},
"test": "gl_unittests",
"use_xvfb": false
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "google_apis_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gpu_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "headless_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "headless_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 3
},
"test": "interactive_ui_tests"
},
{
"args": [
"--enable-features=NetworkService"
],
"name": "network_service_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 3
},
"test": "interactive_ui_tests"
},
{
"args": [
"--enable-features=WebUIPolymer2",
"--test-launcher-filter-file=../../testing/buildbot/filters/webui_polymer2_interactive_ui_tests.filter"
],
"name": "webui_polymer2_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "interactive_ui_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ipc_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "jingle_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "latency_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "leveldb_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "libjingle_xmpp_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "media_blink_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "media_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "media_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "message_center_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "midi_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "mojo_core_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "mojo_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "nacl_helper_nonsfi_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "nacl_loader_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "native_theme_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "net_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "pdf_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ppapi_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "printing_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "remoting_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "sandbox_linux_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "service_manager_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "services_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "shell_dialogs_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "skia_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "snapshot_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "sql_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "storage_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "sync_integration_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "traffic_annotation_auditor_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ui_base_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "ui_touch_selection_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "unit_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "url_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "views_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "viz_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "vr_common_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "vr_pixeltests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "webkit_unit_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "wm_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "wtf_unittests"
}
]
},
"CFI Linux ToT": { "CFI Linux ToT": {
"gtest_tests": [ "gtest_tests": [
{ {
......
...@@ -513,7 +513,6 @@ ...@@ -513,7 +513,6 @@
'gl_tests': { 'gl_tests': {
'remove_from': [ 'remove_from': [
# chromium.clang # chromium.clang
'CFI Linux (icall)',
'CFI Linux ToT', 'CFI Linux ToT',
# chromium.gpu.fyi # chromium.gpu.fyi
'Android FYI Release (Nexus 5X)', 'Android FYI Release (Nexus 5X)',
...@@ -603,22 +602,6 @@ ...@@ -603,22 +602,6 @@
], ],
'modifications': { 'modifications': {
# chromium.clang # chromium.clang
'CFI Linux (icall)': {
'args': [
'--use-gpu-in-tests',
'--no-xvfb',
],
'swarming': {
'dimension_sets': [
{
'gpu': '10de:1cb3',
'os': 'Ubuntu',
'pool': 'Chrome-GPU',
},
],
},
'use_xvfb': False,
},
'CFI Linux ToT': { 'CFI Linux ToT': {
'args': [ 'args': [
'--use-gpu-in-tests', '--use-gpu-in-tests',
......
...@@ -507,11 +507,6 @@ ...@@ -507,11 +507,6 @@
{ {
'name': 'chromium.clang', 'name': 'chromium.clang',
'machines': { 'machines': {
'CFI Linux (icall)': {
'test_suites': {
'gtest_tests': 'chromium_linux_and_gl_gtests',
},
},
'CFI Linux ToT': { 'CFI Linux ToT': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_linux_and_gl_gtests', 'gtest_tests': 'chromium_linux_and_gl_gtests',
......
...@@ -99,7 +99,6 @@ ...@@ -99,7 +99,6 @@
'chromium.clang': { 'chromium.clang': {
'CFI Linux CF': 'cfi_full_cfi_icall_cfi_diag_recover_release_static', 'CFI Linux CF': 'cfi_full_cfi_icall_cfi_diag_recover_release_static',
'CFI Linux ToT': 'clang_tot_cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on', 'CFI Linux ToT': 'clang_tot_cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on',
'CFI Linux (icall)': 'cfi_full_diag_icall_release_static_dcheck_always_on',
'CrWinAsan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release_tot', 'CrWinAsan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release_tot',
'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_minimal_symbols_release_tot', 'CrWinAsan(dll)': 'asan_clang_shared_v8_heap_minimal_symbols_release_tot',
'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_minimal_symbols_release_tot', 'CrWinAsanCov': 'asan_clang_edge_fuzzer_static_v8_heap_minimal_symbols_release_tot',
...@@ -146,7 +145,6 @@ ...@@ -146,7 +145,6 @@
'CFI Linux CF': 'cfi_full_cfi_icall_cfi_diag_recover_release_static', 'CFI Linux CF': 'cfi_full_cfi_icall_cfi_diag_recover_release_static',
'CFI Linux ToT': 'clang_tot_cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on', 'CFI Linux ToT': 'clang_tot_cfi_full_cfi_icall_cfi_diag_thin_lto_release_static_dcheck_always_on',
'CFI Linux (icall)': 'cfi_full_diag_icall_release_static_dcheck_always_on',
'chromeos-amd64-generic-rel-goma-canary': 'cros_chrome_sdk', 'chromeos-amd64-generic-rel-goma-canary': 'cros_chrome_sdk',
'chromeos-amd64-generic-rel-vm-tests': 'cros_chrome_sdk_headless_ozone_dcheck_always_on', 'chromeos-amd64-generic-rel-vm-tests': 'cros_chrome_sdk_headless_ozone_dcheck_always_on',
...@@ -1018,10 +1016,6 @@ ...@@ -1018,10 +1016,6 @@
'cfi_full', 'cfi_icall', 'cfi_diag', 'thin_lto', 'release', 'static', 'dcheck_always_on', 'goma', 'cfi_full', 'cfi_icall', 'cfi_diag', 'thin_lto', 'release', 'static', 'dcheck_always_on', 'goma',
], ],
'cfi_full_diag_icall_release_static_dcheck_always_on': [
'cfi_full', 'cfi_diag', 'cfi_icall', 'clang_tot', 'thin_lto', 'release', 'static', 'dcheck_always_on',
],
'chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [ 'chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
'chromeos', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot', 'chromeos', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
], ],
......
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