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

Unified Diff: masters/master.client.webrtc.fyi/master.cfg

Issue 23231004: WebRTC FYI waterfall (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebased Created 7 years, 4 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
« no previous file with comments | « masters/master.client.webrtc.fyi/buildbot.tac ('k') | masters/master.client.webrtc.fyi/master_linux_cfg.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.client.webrtc.fyi/master.cfg
diff --git a/masters/master.client.webrtc/master.cfg b/masters/master.client.webrtc.fyi/master.cfg
similarity index 76%
copy from masters/master.client.webrtc/master.cfg
copy to masters/master.client.webrtc.fyi/master.cfg
index 2b1360262e389e20b21657080317691e196a5086..1916969d913a4c1b3fe8172ee382aa0e33f3efb4 100644
--- a/masters/master.client.webrtc/master.cfg
+++ b/masters/master.client.webrtc.fyi/master.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -8,7 +8,7 @@ from master import slaves_list
import config
import master_site_config
-ActiveMaster = master_site_config.WebRTC
+ActiveMaster = master_site_config.WebRTCFYI
c = BuildmasterConfig = {}
c['change_source'] = []
@@ -19,23 +19,20 @@ c['status'] = []
config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host)
import master_source_cfg
-import master_win_cfg
-import master_mac_cfg
import master_linux_cfg
master_source_cfg.Update(config, c)
-master_win_cfg.Update(c)
-master_mac_cfg.Update(c)
+
master_linux_cfg.Update(c)
-c['buildbotURL'] = 'http://build.chromium.org/p/client.webrtc/'
+c['buildbotURL'] = 'http://build.chromium.org/p/client.webrtc.fyi/'
# Associate the slaves to the manual builders. The configuration is in
# slaves.cfg.
-slaves = slaves_list.SlavesList('slaves.cfg', 'WebRTC')
+slaves = slaves_list.SlavesList('slaves.cfg', 'WebRTCFYI')
for builder in c['builders']:
builder['slavenames'] = slaves.GetSlavesName(builder=builder['name'])
- # Disable auto_reboot when testing locally.
+ # Don't enable auto_reboot when testing locally.
builder['auto_reboot'] = ActiveMaster.is_production_host
# The 'slaves' list defines the set of allowable buildslaves. List all the
@@ -47,9 +44,10 @@ c['slaves'] = master_utils.AutoSetupSlaves(
master_utils.VerifySetup(c, slaves)
# Adds common status and tools to this master.
-master_utils.AutoSetupMaster(c, ActiveMaster, mail_notifier=True,
+master_utils.AutoSetupMaster(c, ActiveMaster, mail_notifier=False,
public_html='../master.chromium/public_html',
- templates=['./templates', '../master.chromium/templates'],
+ templates=['../master.client.webrtc/templates',
+ '../master.chromium/templates'],
enable_http_status_push=ActiveMaster.is_production_host)
# Do it at the end to override values set by AutoSetupMaster, the default is
« no previous file with comments | « masters/master.client.webrtc.fyi/buildbot.tac ('k') | masters/master.client.webrtc.fyi/master_linux_cfg.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698