From: Stefan Metzmacher Date: Wed, 10 Aug 2016 10:44:26 +0000 (+0200) Subject: script/autobuild.py: include the branch name in the output X-Git-Tag: samba-4.3.12~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f927858030122ba43c3ba047ca742288db1669e6;p=thirdparty%2Fsamba.git script/autobuild.py: include the branch name in the output Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Thu Aug 11 08:38:47 CEST 2016 on sn-devel-144 (cherry picked from commit 98d289d2e5162a23d15562b009d0edf20a55a56b) --- diff --git a/script/autobuild.py b/script/autobuild.py index ba7be19dd02..3777de7ce64 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -571,8 +571,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): @@ -603,7 +603,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) @@ -705,7 +705,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 @@ -714,7 +714,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)