| Index: masters/master.chromium.webrtc/master_cros_cfg.py
|
| diff --git a/masters/master.chromium.webrtc/master_cros_cfg.py b/masters/master.chromium.webrtc/master_cros_cfg.py
|
| index 1c35d19353e68b3a3c63890388b9a96ce17f5e26..8cf82850ec0ba9f07ebd1bd20d0f5434f6543363 100644
|
| --- a/masters/master.chromium.webrtc/master_cros_cfg.py
|
| +++ b/masters/master.chromium.webrtc/master_cros_cfg.py
|
| @@ -18,11 +18,11 @@ def linux(): return chromium_factory.ChromiumFactory('src/build', 'linux2')
|
|
|
|
|
| def CreateCbuildbotFactory(target, short_name):
|
| - """Generate and register a ChromeOS builder along with its slave(s)."""
|
| + """Generate and register a ChromiumOS builder along with its slave(s)."""
|
|
|
| # Factory with the steps to pull out a Chromium source tree (no compilation).
|
| # It uses an unused slave_type string to avoid adding the normal compile step.
|
| - chrome_factory = linux().ChromiumWebRTCLatestFactory(slave_type='WebRtcCros')
|
| + chrome_factory = linux().ChromiumFactory(slave_type='WebRtcCros')
|
|
|
| # Extend that factory with Cbuildbot build steps to build and test CrOS using
|
| # the Chrome from the above Chromium source tree.
|
| @@ -30,7 +30,7 @@ def CreateCbuildbotFactory(target, short_name):
|
| params=target,
|
| buildroot='/b/cbuild.%s' % short_name,
|
| dry_run=True,
|
| - chrome_root='.', # Where ChromiumWebRTCLatestFactory has put "Chrome".
|
| + chrome_root='.', # Where ChromiumFactory has put "Chrome".
|
| factory=chrome_factory,
|
| slave_manager=False).get_factory()
|
|
|
| @@ -39,28 +39,19 @@ S(name='chromium_cros', branch='trunk', treeStableTimer=0)
|
|
|
| defaults['category'] = 'chromiumos'
|
|
|
| -B('ChromiumOS [x86]',
|
| - factory='chromeos_x86_factory',
|
| - builddir='chromium-webrtc-tot-chromeos-x86-generic',
|
| - scheduler='chromium_cros',
|
| +B('ChromiumOS [x86]', 'chromeos_x86_factory', scheduler='chromium_cros',
|
| notify_on_missing=True)
|
| F('chromeos_x86_factory',
|
| CreateCbuildbotFactory(target='x86-webrtc-chrome-pfq-informational',
|
| short_name='x86'))
|
|
|
| -B('ChromiumOS [amd64]',
|
| - factory='chromeos_amd64_factory',
|
| - builddir='chromium-webrtc-tot-chromeos-amd64',
|
| - scheduler='chromium_cros',
|
| +B('ChromiumOS [amd64]', 'chromeos_amd64_factory', scheduler='chromium_cros',
|
| notify_on_missing=True)
|
| F('chromeos_amd64_factory',
|
| CreateCbuildbotFactory(target='amd64-webrtc-chrome-pfq-informational',
|
| short_name='amd64'))
|
|
|
| -B('ChromiumOS [daisy]',
|
| - factory='chromeos_daisy_factory',
|
| - builddir='chromium-webrtc-tot-chromeos-daisy',
|
| - scheduler='chromium_cros',
|
| +B('ChromiumOS [daisy]', 'chromeos_daisy_factory', scheduler='chromium_cros',
|
| notify_on_missing=True)
|
| F('chromeos_daisy_factory',
|
| CreateCbuildbotFactory(target='daisy-webrtc-chrome-pfq-informational',
|
|
|