masters/master.client.gyp/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: masters/master.client.gyp/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 was generated from	5 # This file was generated from

6 # scripts/tools/buildbot_tool_templates/master.cfg	6 # scripts/tools/buildbot_tool_templates/master.cfg

7 # by "scripts/tools/buildbot-tool gen masters/master.client.gyp".	7 # by "scripts/tools/buildbot-tool gen masters/master.client.gyp".

8 # DO NOT EDIT BY HAND!	8 # DO NOT EDIT BY HAND!

9	9

10	10

11 import os	11 import os

12	12

	13 import master_site_config

	14

13 # This module comes from scripts/, which must be in the PYTHONPATH.	15 # This module comes from scripts/, which must be in the PYTHONPATH.

14 from master import master_gen	16 from master import master_gen

15	17

16 # BuildmasterConfig must be defined; it is how buildbot gets the config	18 # BuildmasterConfig must be defined; it is how buildbot gets the config

17 # info for the master.	19 # info for the master.

18	20

19 BuildmasterConfig = {}	21 BuildmasterConfig = {}

20	22

21 master_gen.PopulateBuildmasterConfig(	23 master_gen.PopulateBuildmasterConfig(

22 BuildmasterConfig,	24 BuildmasterConfig,

23 os.path.join(os.path.dirname(os.path.abspath(__file__)), 'builders.pyl'))	25 os.path.join(os.path.dirname(os.path.abspath(__file__)), 'builders.pyl'),

	26 master_site_config.GYP)

OLD	NEW

« no previous file with comments | « masters/master.client.crashpad/master.cfg ('k') | masters/master.tryserver.client.catapult/master.cfg » ('j') | no next file with comments »