masters/master.tryserver.client.catapult/master.cfg - Issue 1152093002: Adjust master_gen.PopulateBuildmasterConfig() to look at master_site_config

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

Unified Diff: masters/master.tryserver.client.catapult/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 side-by-side diff with in-line comments

Download patch

Index: masters/master.tryserver.client.catapult/master.cfg

diff --git a/masters/master.tryserver.client.catapult/master.cfg b/masters/master.tryserver.client.catapult/master.cfg

index 2ca06a34f724c79b2c3974980679be1be9384724..3badbf3db343de2dd5adec6231e1d888bdcc21a0 100644

--- a/masters/master.tryserver.client.catapult/master.cfg

+++ b/masters/master.tryserver.client.catapult/master.cfg

@@ -10,6 +10,8 @@

import os

+import master_site_config

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

from master import master_gen

@@ -20,4 +22,5 @@ BuildmasterConfig = {}

master_gen.PopulateBuildmasterConfig(

BuildmasterConfig,

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

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

+ master_site_config.CatapultTryserver)

« no previous file with comments | « masters/master.client.gyp/master.cfg ('k') | scripts/master/master_gen.py » ('j') | no next file with comments »