Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: masters/master.chromiumos.chromium/master_chromium_cfg.py

Issue 1978723002: CrOS: New Builder for chromiumos.chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Add to master config too. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | masters/master.chromiumos.chromium/slaves.cfg » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 from master import master_config 5 from master import master_config
6 from master.factory import annotator_factory, chromeos_factory 6 from master.factory import annotator_factory, chromeos_factory
7 7
8 from buildbot.schedulers.basic import SingleBranchScheduler as Scheduler 8 from buildbot.schedulers.basic import SingleBranchScheduler as Scheduler
9 9
10 def Builder(factory_obj, board): 10 def Builder(factory_obj, board, gn=False):
11 config = '%s-tot-chromium-pfq-informational' % (board,) 11 suffix = ''
12 if gn:
13 suffix = '-gn'
14
15 config = '%s-tot-chromium-pfq-informational%s' % (board, suffix)
12 builder = { 16 builder = {
13 'name': config, 17 'name': config,
14 'builddir': config, 18 'builddir': config,
15 'category': '2chromium', 19 'category': '2chromium',
16 'factory': chromeos_factory.ChromiteRecipeFactory( 20 'factory': chromeos_factory.ChromiteRecipeFactory(
17 factory_obj, 'cros/cbuildbot'), 21 factory_obj, 'cros/cbuildbot'),
18 'gatekeeper': 'pfq', 22 'gatekeeper': 'pfq',
19 'scheduler': 'chromium_cros', 23 'scheduler': 'chromium_cros',
20 'notify_on_missing': True, 24 'notify_on_missing': True,
21 'properties': { 25 'properties': {
22 'cbb_config': config, 26 'cbb_config': config,
23 }, 27 },
24 } 28 }
25 return builder 29 return builder
26 30
27 31
28 def Update(_config, active_master, c): 32 def Update(_config, active_master, c):
29 factory_obj = annotator_factory.AnnotatorFactory( 33 factory_obj = annotator_factory.AnnotatorFactory(
30 active_master=active_master) 34 active_master=active_master)
31 35
32 builders = [ 36 builders = [
33 Builder(factory_obj, 'x86-generic'), 37 Builder(factory_obj, 'x86-generic'),
34 Builder(factory_obj, 'amd64-generic'), 38 Builder(factory_obj, 'amd64-generic'),
35 Builder(factory_obj, 'daisy'), 39 Builder(factory_obj, 'daisy'),
40 Builder(factory_obj, 'amd64-generic', gn=True),
36 ] 41 ]
37 42
38 c['schedulers'] += [ 43 c['schedulers'] += [
39 Scheduler(name='chromium_cros', 44 Scheduler(name='chromium_cros',
40 branch='master', 45 branch='master',
41 treeStableTimer=60, 46 treeStableTimer=60,
42 builderNames=[b['name'] for b in builders], 47 builderNames=[b['name'] for b in builders],
43 ), 48 ),
44 ] 49 ]
45 c['builders'] += builders 50 c['builders'] += builders
OLDNEW
« no previous file with comments | « no previous file | masters/master.chromiumos.chromium/slaves.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698