| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 | 5 |
| 6 from master import master_config | 6 from master import master_config |
| 7 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
| 8 | 8 |
| 9 defaults = {} | 9 defaults = {} |
| 10 | 10 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 # | 42 # |
| 43 B('Android Builder', 'f_android_rel', scheduler='s5_android_webkit') | 43 B('Android Builder', 'f_android_rel', scheduler='s5_android_webkit') |
| 44 F('f_android_rel', linux_android().ChromiumWebkitLatestAnnotationFactory( | 44 F('f_android_rel', linux_android().ChromiumWebkitLatestAnnotationFactory( |
| 45 target='Release', | 45 target='Release', |
| 46 annotation_script='src/build/android/buildbot/bb_webkit_latest_builder.sh', | 46 annotation_script='src/build/android/buildbot/bb_webkit_latest_builder.sh', |
| 47 factory_properties={ | 47 factory_properties={ |
| 48 'trigger': 'android_rel_trigger', | 48 'trigger': 'android_rel_trigger', |
| 49 'build_url': android_rel_archive, | 49 'build_url': android_rel_archive, |
| 50 })) | 50 })) |
| 51 | 51 |
| 52 B('Webkit Android Tests (GalaxyNexus)', 'f_webkit_android_tests', None, | 52 B('WebKit Android Tests (GalaxyNexus)', 'f_webkit_android_tests', None, |
| 53 'android_rel_trigger', auto_reboot=False) | 53 'android_rel_trigger', auto_reboot=False) |
| 54 F('f_webkit_android_tests', | 54 F('f_webkit_android_tests', |
| 55 linux_android().ChromiumWebkitLatestAnnotationFactory( | 55 linux_android().ChromiumWebkitLatestAnnotationFactory( |
| 56 annotation_script=('src/build/android/buildbot/' | 56 annotation_script=('src/build/android/buildbot/' |
| 57 'bb_webkit_latest_webkit_tester.sh'), | 57 'bb_webkit_latest_webkit_tester.sh'), |
| 58 factory_properties={ | 58 factory_properties={ |
| 59 'build_url': android_rel_archive, | 59 'build_url': android_rel_archive, |
| 60 'archive_webkit_results': True, | 60 'archive_webkit_results': True, |
| 61 'generate_gtest_json': True, | 61 'generate_gtest_json': True, |
| 62 'test_results_server': 'test-results.appspot.com', | 62 'test_results_server': 'test-results.appspot.com', |
| 63 })) | 63 })) |
| 64 def Update(config, active_master, c): | 64 def Update(config, active_master, c): |
| 65 return helper.Update(c) | 65 return helper.Update(c) |
| OLD | NEW |