summaryrefslogtreecommitdiff
path: root/build/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'build/scripts')
-rw-r--r--build/scripts/common/chromium_utils.py2
-rw-r--r--build/scripts/tools/buildbot_tool_templates/master.cfg5
2 files changed, 6 insertions, 1 deletions
diff --git a/build/scripts/common/chromium_utils.py b/build/scripts/common/chromium_utils.py
index dec2c8e0..0c18b580 100644
--- a/build/scripts/common/chromium_utils.py
+++ b/build/scripts/common/chromium_utils.py
@@ -1852,7 +1852,7 @@ def ParseBuildersFileContents(path, contents):
builders['master_dirname'] = master_dirname
builders.setdefault('master_classname', master_classname)
builders.setdefault('buildbot_url',
- 'https://build.chromium.org/p/%s/' % buildbot_path)
+ 'http://chromeos1-row3-rack2-host1.cros.corp.google.com:8200/')
builders.setdefault('buildbucket_bucket', None)
builders.setdefault('service_account_file', None)
diff --git a/build/scripts/tools/buildbot_tool_templates/master.cfg b/build/scripts/tools/buildbot_tool_templates/master.cfg
index 98844281..0cdc6f3f 100644
--- a/build/scripts/tools/buildbot_tool_templates/master.cfg
+++ b/build/scripts/tools/buildbot_tool_templates/master.cfg
@@ -16,6 +16,11 @@ from master import master_gen
BuildmasterConfig = {}
+# This requires a master_mail_notifications.py file in the master directory to
+# specify mail notifier. Make AddMailNotifier a no-op if none desired.
+import master_mail_notifications
+master_mail_notifications.AddMailNotifier(BuildmasterConfig)
+
master_gen.PopulateBuildmasterConfig(
BuildmasterConfig,
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'builders.pyl'),