Commit 363fa3bc authored by sbc's avatar sbc Committed by Commit bot

Update 'mb' setting for Linux ARM bots

- Add 'swarming' settings since these bots now use swarming.
- Remove 'arm_linux_tester' and corresponding 'none' settings.
- Remove now unused 'arm_float' settings.

CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_arm_compile
BUG=159519

Review URL: https://codereview.chromium.org/1470623002

Cr-Commit-Position: refs/heads/master@{#361028}
parent fa9b77fa
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
'gyp_official_goma_minimal_symbols_android_arm64': ['gyp', 'official', 'goma', 'minimal_symbols', 'android', 'arm64'], 'gyp_official_goma_minimal_symbols_android_arm64': ['gyp', 'official', 'goma', 'minimal_symbols', 'android', 'arm64'],
'gyp_official_goma_minimal_symbols_x64': ['gyp', 'official', 'goma', 'minimal_symbols', 'x64'], 'gyp_official_goma_minimal_symbols_x64': ['gyp', 'official', 'goma', 'minimal_symbols', 'x64'],
'gyp_official_goma_minimal_symbols_x86': ['gyp', 'official', 'goma', 'minimal_symbols', 'x86'], 'gyp_official_goma_minimal_symbols_x86': ['gyp', 'official', 'goma', 'minimal_symbols', 'x86'],
'gyp_release_bot_arm': ['gyp', 'release_bot', 'arm', 'crosscompile'],
'gyp_release_trybot': ['gyp', 'release_trybot'], 'gyp_release_trybot': ['gyp', 'release_trybot'],
'gyp_release_trybot_x64': ['gyp', 'release_trybot', 'x64'], 'gyp_release_trybot_x64': ['gyp', 'release_trybot', 'x64'],
'libfuzzer_upload_bot': ['gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs'], 'libfuzzer_upload_bot': ['gn', 'release', 'libfuzzer', 'asan', 'proprietary_codecs'],
...@@ -78,8 +77,8 @@ ...@@ -78,8 +77,8 @@
'swarming_gyp_debug_bot_no_symbols_x86': ['swarming', 'gyp', 'debug_bot', 'no_symbols', 'x86'], 'swarming_gyp_debug_bot_no_symbols_x86': ['swarming', 'gyp', 'debug_bot', 'no_symbols', 'x86'],
'swarming_gyp_debug_trybot_x86': ['swarming', 'gyp', 'debug_trybot', 'x86'], 'swarming_gyp_debug_trybot_x86': ['swarming', 'gyp', 'debug_trybot', 'x86'],
'swarming_gyp_release_bot': ['swarming', 'gyp', 'release_bot'], 'swarming_gyp_release_bot': ['swarming', 'gyp', 'release_bot'],
'swarming_gyp_release_bot_arm': ['swarming', 'gyp', 'release_bot', 'arm', 'crosscompile'],
'swarming_gyp_release_trybot_arm': ['swarming', 'gyp', 'release_trybot', 'arm', 'crosscompile'], 'swarming_gyp_release_trybot_arm': ['swarming', 'gyp', 'release_trybot', 'arm', 'crosscompile'],
'swarming_gyp_release_trybot_arm_float': ['swarming', 'gyp', 'release_trybot', 'arm_float', 'crosscompile'],
'swarming_tsan_gyp_release_trybot': ['swarming', 'disable_nacl', 'tsan', 'gyp', 'release_trybot'], 'swarming_tsan_gyp_release_trybot': ['swarming', 'disable_nacl', 'tsan', 'gyp', 'release_trybot'],
# clang/win doesn't work with goma yet, so this can't use debug_bot: # clang/win doesn't work with goma yet, so this can't use debug_bot:
...@@ -127,11 +126,6 @@ ...@@ -127,11 +126,6 @@
'gyp_defines': 'target_arch=arm64', 'gyp_defines': 'target_arch=arm64',
}, },
'arm_float': {
'gn_args': 'error',
'gyp_defines': 'target_arch=arm arm_float_abi=hard',
},
'arm64': { 'arm64': {
'gn_args': 'target_cpu="arm64"', 'gn_args': 'target_cpu="arm64"',
'gyp_defines': 'target_arch=arm64', 'gyp_defines': 'target_arch=arm64',
...@@ -387,11 +381,11 @@ ...@@ -387,11 +381,11 @@
}, },
'chromium.linux': { 'chromium.linux': {
'Linux Builder': 'swarming_gn_release_bot', 'Linux Builder': 'swarming_gn_release_bot',
'Linux Tests': 'swarming_gn_release_bot', 'Linux Tests': 'none',
'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86', 'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
'Linux Tests (dbg)(1)(32)': 'swarming_gyp_debug_bot_no_symbols_x86', 'Linux Tests (dbg)(1)(32)': 'none',
'Linux Builder (dbg)': 'swarming_gn_debug_bot', 'Linux Builder (dbg)': 'swarming_gn_debug_bot',
'Linux Tests (dbg)(1)': 'swarming_gn_debug_bot', 'Linux Tests (dbg)(1)': 'none',
'Linux GN': 'gn_release_bot', 'Linux GN': 'gn_release_bot',
'Linux GN Clobber': 'gn_release_bot', 'Linux GN Clobber': 'gn_release_bot',
'Linux GN (dbg)': 'gn_debug_bot', 'Linux GN (dbg)': 'gn_debug_bot',
...@@ -445,7 +439,7 @@ ...@@ -445,7 +439,7 @@
'Libfuzzer Upload Linux': 'libfuzzer_upload_bot', 'Libfuzzer Upload Linux': 'libfuzzer_upload_bot',
'Site Isolation Linux': 'gn_release_trybot', 'Site Isolation Linux': 'gn_release_trybot',
'Site Isolation Win': 'gyp_release_trybot_x64', 'Site Isolation Win': 'gyp_release_trybot_x64',
'Linux ARM': 'gyp_release_bot_arm', 'Linux ARM': 'swarming_gyp_release_bot_arm',
}, },
'chromium.webrtc.fyi': { 'chromium.webrtc.fyi': {
'Android GN': 'android_gn_release_bot', 'Android GN': 'android_gn_release_bot',
...@@ -507,8 +501,6 @@ ...@@ -507,8 +501,6 @@
'linux_chromium_tsan_rel_ng': 'swarming_tsan_gyp_release_trybot', 'linux_chromium_tsan_rel_ng': 'swarming_tsan_gyp_release_trybot',
'linux_chromium_practice_rel_ng': 'gyp_release_trybot', 'linux_chromium_practice_rel_ng': 'gyp_release_trybot',
'linux_arm_compile': 'swarming_gyp_release_trybot_arm', 'linux_arm_compile': 'swarming_gyp_release_trybot_arm',
'linux_arm': 'swarming_gyp_release_trybot_arm_float',
'linux_arm_tester': 'none',
'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86', 'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86', 'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
'linux_chromium_archive_rel_ng': 'noswarming_gyp_release_bot_linux_dump_symbols', 'linux_chromium_archive_rel_ng': 'noswarming_gyp_release_bot_linux_dump_symbols',
......
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