OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # | 2 # |
3 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 import collections | 7 import collections |
8 import json | 8 import json |
9 import optparse | 9 import optparse |
10 import os | 10 import os |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 std_tests = ['ui', 'unit'] | 73 std_tests = ['ui', 'unit'] |
74 | 74 |
75 B = BotConfig | 75 B = BotConfig |
76 def T(tests, extra_args=None): | 76 def T(tests, extra_args=None): |
77 return TestConfig(tests, extra_args) | 77 return TestConfig(tests, extra_args) |
78 | 78 |
79 bot_configs = [ | 79 bot_configs = [ |
80 # Main builders | 80 # Main builders |
81 B('main-builder-dbg', | 81 B('main-builder-dbg', |
82 ['bb_compile', 'bb_run_findbugs', 'bb_zip_build'], None, None), | 82 ['bb_compile', 'bb_run_findbugs', 'bb_zip_build'], None, None), |
83 B('main-builder-rel', compile_step, None, None), | 83 B('main-builder-rel', |
| 84 ['bb_compile', 'bb_zip_build'], None, None), |
84 B('main-clang-builder', compile_step, None, None), | 85 B('main-clang-builder', compile_step, None, None), |
85 B('main-clobber', compile_step, None, None), | 86 B('main-clobber', compile_step, None, None), |
86 B('main-tests-dbg', std_test_steps, T(std_tests), None), | 87 B('main-tests', std_test_steps, T(std_tests), None), |
87 | 88 |
88 # Other waterfalls | 89 # Other waterfalls |
89 B('asan-builder', std_build_steps, None, None), | 90 B('asan-builder', std_build_steps, None, None), |
90 B('asan-tests', std_test_steps + ['bb_asan_tests_setup'], | 91 B('asan-tests', std_test_steps + ['bb_asan_tests_setup'], |
91 T(std_tests, ['--asan']), None), | 92 T(std_tests, ['--asan']), None), |
92 B('fyi-builder-dbg', | 93 B('fyi-builder-dbg', |
93 ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental', | 94 ['bb_check_webview_licenses', 'bb_compile', 'bb_compile_experimental', |
94 'bb_run_findbugs', 'bb_zip_build'], None, None), | 95 'bb_run_findbugs', 'bb_zip_build'], None, None), |
95 B('fyi-builder-rel', | 96 B('fyi-builder-rel', |
96 ['bb_compile', 'bb_compile_experimental', 'bb_zip_build'], None, None), | 97 ['bb_compile', 'bb_compile_experimental', 'bb_zip_build'], None, None), |
97 B('fyi-tests', std_test_steps, | 98 B('fyi-tests', std_test_steps, |
98 T(std_tests, ['--experimental', '--upload-to-flakiness-server']), None), | 99 T(std_tests, ['--experimental', '--upload-to-flakiness-server']), None), |
99 B('perf-tests-rel', std_test_steps, T([], ['--install=ContentShell']), | 100 B('perf-tests-rel', std_test_steps, T([], ['--install=ContentShell']), |
100 None), | 101 None), |
101 B('try-fyi-tests', std_test_steps, T(std_tests, ['--experimental']), | 102 B('try-fyi-tests', std_test_steps, T(std_tests, ['--experimental']), |
102 None), | 103 None), |
103 B('webkit-latest-tests', std_test_steps, T(['unit']), None), | 104 B('webkit-latest-tests', std_test_steps, T(['unit']), None), |
104 B('webkit-latest-webkit-tests', std_test_steps, | 105 B('webkit-latest-webkit-tests', std_test_steps, |
105 T(['webkit_layout', 'webkit']), None), | 106 T(['webkit_layout', 'webkit']), None), |
106 | 107 |
107 # Generic builder config (for substring match). | 108 # Generic builder config (for substring match). |
108 B('builder', std_build_steps, None, None), | 109 B('builder', std_build_steps, None, None), |
109 ] | 110 ] |
110 | 111 |
111 bot_map = dict((config.bot_id, config) for config in bot_configs) | 112 bot_map = dict((config.bot_id, config) for config in bot_configs) |
112 | 113 |
113 # These bots have identical configuration to ones defined earlier. | 114 # These bots have identical configuration to ones defined earlier. |
114 copy_map = [ | 115 copy_map = [ |
115 ('try-builder-dbg', 'main-builder-dbg'), | 116 ('try-builder-dbg', 'main-builder-dbg'), |
116 ('try-tests-dbg', 'main-tests-dbg'), | 117 ('try-builder-rel', 'main-builder-rel'), |
117 ('try-clang-builder', 'main-clang-builder'), | 118 ('try-clang-builder', 'main-clang-builder'), |
118 ('try-fyi-builder-dbg', 'fyi-builder-dbg'), | 119 ('try-fyi-builder-dbg', 'fyi-builder-dbg'), |
| 120 ('try-tests', 'main-tests'), |
119 ] | 121 ] |
120 for to_id, from_id in copy_map: | 122 for to_id, from_id in copy_map: |
121 assert to_id not in bot_map | 123 assert to_id not in bot_map |
122 # pylint: disable=W0212 | 124 # pylint: disable=W0212 |
123 bot_map[to_id] = bot_map[from_id]._replace(bot_id=to_id) | 125 bot_map[to_id] = bot_map[from_id]._replace(bot_id=to_id) |
124 | 126 |
125 return bot_map | 127 return bot_map |
126 | 128 |
127 | 129 |
128 def main(argv): | 130 def main(argv): |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 continue | 190 continue |
189 env = dict(os.environ) | 191 env = dict(os.environ) |
190 env['BUILDBOT_TESTING'] = '1' | 192 env['BUILDBOT_TESTING'] = '1' |
191 | 193 |
192 return_code |= subprocess.call(command, cwd=CHROME_SRC, env=env) | 194 return_code |= subprocess.call(command, cwd=CHROME_SRC, env=env) |
193 return return_code | 195 return return_code |
194 | 196 |
195 | 197 |
196 if __name__ == '__main__': | 198 if __name__ == '__main__': |
197 sys.exit(main(sys.argv)) | 199 sys.exit(main(sys.argv)) |
OLD | NEW |