diff options
author | Stefan Metzmacher <metze@samba.org> | 2016-08-10 12:44:26 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2016-08-15 20:57:59 +0200 |
commit | ac2b4cb74a7aeb96540d7c228b014105835a92d4 (patch) | |
tree | a3adac7e3eface4fc873250c1803fd3abd1e336c /script | |
parent | 4f41b6927a7fc59b80912895b04e78eb48caa055 (diff) | |
download | samba-ac2b4cb74a7aeb96540d7c228b014105835a92d4.tar.gz |
script/autobuild.py: include the branch name in the output
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Thu Aug 11 08:38:47 CEST 2016 on sn-devel-144
(cherry picked from commit 98d289d2e5162a23d15562b009d0edf20a55a56b)
Autobuild-User(v4-5-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-5-test): Mon Aug 15 20:57:59 CEST 2016 on sn-devel-144
Diffstat (limited to 'script')
-rwxr-xr-x | script/autobuild.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index 811f906b8d1..419fe1a58cb 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -634,8 +634,8 @@ The last 50 lines of log messages: f.close() logs = os.path.join(gitroot, 'logs.tar.gz') - send_email('autobuild failure on %s for task %s during %s' - % (platform.node(), failed_task, failed_stage), + send_email('autobuild[%s] failure on %s for task %s during %s' + % (options.branch, platform.node(), failed_task, failed_stage), text, logs) def email_success(elapsed_time, log_base=None): @@ -666,7 +666,7 @@ The top commit for the tree that was built was: ''' % top_commit_msg logs = os.path.join(gitroot, 'logs.tar.gz') - send_email('autobuild success on %s' % platform.node(), + send_email('autobuild[%s] success on %s' % (options.branch, platform.node()), text, logs) @@ -768,7 +768,7 @@ else: AUTOBUILD FAILURE -Your autobuild on %s failed after %.1f minutes +Your autobuild[%s] on %s failed after %.1f minutes when trying to test %s with the following error: %s @@ -777,7 +777,7 @@ the autobuild has been abandoned. Please fix the error and resubmit. #################################################################### -''' % (platform.node(), elapsed_minutes, failed_task, errstr) +''' % (options.branch, platform.node(), elapsed_minutes, failed_task, errstr) cleanup() print(errstr) |