scripts/tools/buildbot_tool_templates/waterfall/master.cfg - Issue 1152093002: Adjust master_gen.PopulateBuildmasterConfig() to look at master_site_config

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: scripts/tools/buildbot_tool_templates/waterfall/master.cfg

Issue 1152093002: Adjust master_gen.PopulateBuildmasterConfig() to look at master_site_config (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: add active_master_cls param to AnnotatorFactory() Created 5 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

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 # This file is used by scripts/tools/buildbot-tool to generate master configs.	5 # This file is used by scripts/tools/buildbot-tool to generate master configs.

6	6

7 import os	7 import os

8	8

	9 import master_site_config

	10

9 # This module comes from scripts/, which must be in the PYTHONPATH.	11 # This module comes from scripts/, which must be in the PYTHONPATH.

10 from master import master_gen	12 from master import master_gen

11	13

12 # BuildmasterConfig must be defined; it is how buildbot gets the config	14 # BuildmasterConfig must be defined; it is how buildbot gets the config

13 # info for the master.	15 # info for the master.

14	16

15 BuildmasterConfig = {}	17 BuildmasterConfig = {}

16	18

17 master_gen.PopulateBuildmasterConfig(	19 master_gen.PopulateBuildmasterConfig(

18 BuildmasterConfig,	20 BuildmasterConfig,

19 os.path.join(os.path.dirname(os.path.abspath(__file__)), 'builders.pyl'))	21 os.path.join(os.path.dirname(os.path.abspath(__file__)), 'builders.pyl'),

	22 master_site_config.%(master_classname)s)

OLD	NEW

« no previous file with comments | « scripts/tools/buildbot_tool_templates/tryserver/master.cfg ('k') | no next file » | no next file with comments »