From edba81f8ed914b7f6cf18c46c34d3dddef16c4d7 Mon Sep 17 00:00:00 2001 From: Armand Navabi Date: Wed, 11 Nov 2015 17:01:19 -0800 Subject: Fix mail notifications and allow automatic generation of master config files. Add important information to mail sent out my master on new failures for the emulator bot. This change also changes the way the mail notifier is defined so that master.cfg can be automatically generated by the build/scripts/tools/buildbot-tool script. It does so by requiring a new file in every master directory in addition to builders.pyl (i.e. master_mail_notifications.py). Change-Id: I6c6ea40b1ece0a9037f828b8badbba827643e05c --- build/scripts/common/chromium_utils.py | 2 +- build/scripts/tools/buildbot_tool_templates/master.cfg | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'build/scripts') 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'), -- cgit v1.2.3