| 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 from master import master_config | 5 from master import master_config |
| 6 from master.factory import chromeos_factory | 6 from master.factory import chromeos_factory |
| 7 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
| 8 | 8 |
| 9 defaults = {} | 9 defaults = {} |
| 10 | 10 |
| 11 helper = master_config.Helper(defaults) | 11 helper = master_config.Helper(defaults) |
| 12 B = helper.Builder | 12 B = helper.Builder |
| 13 F = helper.Factory | 13 F = helper.Factory |
| 14 S = helper.Scheduler | 14 S = helper.Scheduler |
| 15 | 15 |
| 16 | 16 |
| 17 def linux(): return chromium_factory.ChromiumFactory('src/build', 'linux2') | 17 def linux(): return chromium_factory.ChromiumFactory('src/build', 'linux2') |
| 18 | 18 |
| 19 | 19 |
| 20 def CreateCbuildbotFactory(target, short_name): | 20 def CreateCbuildbotFactory(target, short_name): |
| 21 """Generate and register a ChromeOS builder along with its slave(s).""" | 21 """Generate and register a ChromiumOS builder along with its slave(s).""" |
| 22 | 22 |
| 23 # Factory with the steps to pull out a Chromium source tree (no compilation). | 23 # Factory with the steps to pull out a Chromium source tree (no compilation). |
| 24 # It uses an unused slave_type string to avoid adding the normal compile step. | 24 # It uses an unused slave_type string to avoid adding the normal compile step. |
| 25 chrome_factory = linux().ChromiumWebRTCLatestFactory(slave_type='WebRtcCros') | 25 chrome_factory = linux().ChromiumFactory(slave_type='WebRtcCros') |
| 26 | 26 |
| 27 # Extend that factory with Cbuildbot build steps to build and test CrOS using | 27 # Extend that factory with Cbuildbot build steps to build and test CrOS using |
| 28 # the Chrome from the above Chromium source tree. | 28 # the Chrome from the above Chromium source tree. |
| 29 return chromeos_factory.CbuildbotFactory( | 29 return chromeos_factory.CbuildbotFactory( |
| 30 params=target, | 30 params=target, |
| 31 buildroot='/b/cbuild.%s' % short_name, | 31 buildroot='/b/cbuild.%s' % short_name, |
| 32 dry_run=True, | 32 dry_run=True, |
| 33 chrome_root='.', # Where ChromiumWebRTCLatestFactory has put "Chrome". | 33 chrome_root='.', # Where ChromiumFactory has put "Chrome". |
| 34 factory=chrome_factory, | 34 factory=chrome_factory, |
| 35 slave_manager=False).get_factory() | 35 slave_manager=False).get_factory() |
| 36 | 36 |
| 37 | 37 |
| 38 S(name='chromium_cros', branch='trunk', treeStableTimer=0) | 38 S(name='chromium_cros', branch='trunk', treeStableTimer=0) |
| 39 | 39 |
| 40 defaults['category'] = 'chromiumos' | 40 defaults['category'] = 'chromiumos' |
| 41 | 41 |
| 42 B('ChromiumOS [x86]', | 42 B('ChromiumOS [x86]', 'chromeos_x86_factory', scheduler='chromium_cros', |
| 43 factory='chromeos_x86_factory', | |
| 44 builddir='chromium-webrtc-tot-chromeos-x86-generic', | |
| 45 scheduler='chromium_cros', | |
| 46 notify_on_missing=True) | 43 notify_on_missing=True) |
| 47 F('chromeos_x86_factory', | 44 F('chromeos_x86_factory', |
| 48 CreateCbuildbotFactory(target='x86-webrtc-chrome-pfq-informational', | 45 CreateCbuildbotFactory(target='x86-webrtc-chrome-pfq-informational', |
| 49 short_name='x86')) | 46 short_name='x86')) |
| 50 | 47 |
| 51 B('ChromiumOS [amd64]', | 48 B('ChromiumOS [amd64]', 'chromeos_amd64_factory', scheduler='chromium_cros', |
| 52 factory='chromeos_amd64_factory', | |
| 53 builddir='chromium-webrtc-tot-chromeos-amd64', | |
| 54 scheduler='chromium_cros', | |
| 55 notify_on_missing=True) | 49 notify_on_missing=True) |
| 56 F('chromeos_amd64_factory', | 50 F('chromeos_amd64_factory', |
| 57 CreateCbuildbotFactory(target='amd64-webrtc-chrome-pfq-informational', | 51 CreateCbuildbotFactory(target='amd64-webrtc-chrome-pfq-informational', |
| 58 short_name='amd64')) | 52 short_name='amd64')) |
| 59 | 53 |
| 60 B('ChromiumOS [daisy]', | 54 B('ChromiumOS [daisy]', 'chromeos_daisy_factory', scheduler='chromium_cros', |
| 61 factory='chromeos_daisy_factory', | |
| 62 builddir='chromium-webrtc-tot-chromeos-daisy', | |
| 63 scheduler='chromium_cros', | |
| 64 notify_on_missing=True) | 55 notify_on_missing=True) |
| 65 F('chromeos_daisy_factory', | 56 F('chromeos_daisy_factory', |
| 66 CreateCbuildbotFactory(target='daisy-webrtc-chrome-pfq-informational', | 57 CreateCbuildbotFactory(target='daisy-webrtc-chrome-pfq-informational', |
| 67 short_name='daisy')) | 58 short_name='daisy')) |
| 68 | 59 |
| 69 | 60 |
| 70 def Update(config, active_master, c): | 61 def Update(config, active_master, c): |
| 71 helper.Update(c) | 62 helper.Update(c) |
| OLD | NEW |