OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # Recipe for building Chromium and running WebRTC-specific tests with special | 5 # Recipe for building Chromium and running WebRTC-specific tests with special |
6 # requirements that doesn't allow them to run in the main Chromium waterfalls. | 6 # requirements that doesn't allow them to run in the main Chromium waterfalls. |
7 # Also provide a set of FYI bots that builds Chromium with WebRTC ToT to provide | 7 # Also provide a set of FYI bots that builds Chromium with WebRTC ToT to provide |
8 # pre-roll test results. | 8 # pre-roll test results. |
9 | 9 |
10 DEPS = [ | 10 DEPS = [ |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 for c in recipe_config.get('gclient_apply_config', []): | 49 for c in recipe_config.get('gclient_apply_config', []): |
50 api.gclient.apply_config(c) | 50 api.gclient.apply_config(c) |
51 | 51 |
52 if api.platform.is_win: | 52 if api.platform.is_win: |
53 api.chromium.taskkill() | 53 api.chromium.taskkill() |
54 | 54 |
55 bot_type = bot_config.get('bot_type', 'builder_tester') | 55 bot_type = bot_config.get('bot_type', 'builder_tester') |
56 | 56 |
57 # Bot Update re-uses the gclient configs. | 57 # Bot Update re-uses the gclient configs. |
58 step_result = api.bot_update.ensure_checkout(force=True) | 58 step_result = api.bot_update.ensure_checkout(force=True) |
59 got_revision = step_result.presentation.properties['got_revision'] | 59 rev_props = step_result.presentation.properties |
| 60 got_webrtc_revision = rev_props['got_webrtc_revision'] |
| 61 got_chromium_revision = rev_props.get('got_chromium_revision') |
60 | 62 |
61 if not bot_config.get('disable_runhooks'): | 63 if not bot_config.get('disable_runhooks'): |
62 api.chromium.runhooks() | 64 api.chromium.runhooks() |
63 | 65 |
64 if bot_type in ('builder', 'builder_tester'): | 66 if bot_type in ('builder', 'builder_tester'): |
65 run_gn = api.chromium.c.project_generator.tool == 'gn' | 67 run_gn = api.chromium.c.project_generator.tool == 'gn' |
66 if run_gn: | 68 if run_gn: |
67 api.chromium.run_gn(use_goma=True) | 69 api.chromium.run_gn(use_goma=True) |
68 | 70 |
69 compile_targets = recipe_config.get('compile_targets', []) | 71 compile_targets = recipe_config.get('compile_targets', []) |
(...skipping 15 matching lines...) Expand all Loading... |
85 if bot_type in ('builder_tester', 'tester'): | 87 if bot_type in ('builder_tester', 'tester'): |
86 api.webrtc.cleanup() | 88 api.webrtc.cleanup() |
87 if api.chromium.c.TARGET_PLATFORM == 'android': | 89 if api.chromium.c.TARGET_PLATFORM == 'android': |
88 api.chromium_android.common_tests_setup_steps() | 90 api.chromium_android.common_tests_setup_steps() |
89 api.chromium_android.run_test_suite( | 91 api.chromium_android.run_test_suite( |
90 'content_browsertests', | 92 'content_browsertests', |
91 gtest_filter='WebRtc*') | 93 gtest_filter='WebRtc*') |
92 api.chromium_android.common_tests_final_steps() | 94 api.chromium_android.common_tests_final_steps() |
93 else: | 95 else: |
94 test_runner = lambda: api.webrtc.runtests(recipe_config.get('test_suite'), | 96 test_runner = lambda: api.webrtc.runtests(recipe_config.get('test_suite'), |
95 revision=got_revision) | 97 revision=got_revision, |
| 98 cr_revision=got_cr_revision) |
96 api.chromium_tests.setup_chromium_tests(test_runner) | 99 api.chromium_tests.setup_chromium_tests(test_runner) |
97 | 100 |
98 | 101 |
99 def _sanitize_nonalpha(text): | 102 def _sanitize_nonalpha(text): |
100 return ''.join(c if c.isalnum() else '_' for c in text) | 103 return ''.join(c if c.isalnum() else '_' for c in text) |
101 | 104 |
102 | 105 |
103 def GenTests(api): | 106 def GenTests(api): |
104 builders = api.webrtc.BUILDERS | 107 builders = api.webrtc.BUILDERS |
105 | 108 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 | 157 |
155 # Periodic scheduler triggered builds also don't contain revision. | 158 # Periodic scheduler triggered builds also don't contain revision. |
156 mastername = 'chromium.webrtc.fyi' | 159 mastername = 'chromium.webrtc.fyi' |
157 yield generate_builder(mastername, 'Win Builder', revision=None, | 160 yield generate_builder(mastername, 'Win Builder', revision=None, |
158 suffix='_periodic_triggered') | 161 suffix='_periodic_triggered') |
159 | 162 |
160 # Testers gets got_revision value from builder passed as parent_got_revision. | 163 # Testers gets got_revision value from builder passed as parent_got_revision. |
161 yield generate_builder(mastername, 'Win7 Tester', revision=None, | 164 yield generate_builder(mastername, 'Win7 Tester', revision=None, |
162 parent_got_revision='12345', | 165 parent_got_revision='12345', |
163 suffix='_periodic_triggered') | 166 suffix='_periodic_triggered') |
OLD | NEW |