1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00

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
This commit is contained in:
Stefan Metzmacher 2016-08-10 12:44:26 +02:00 committed by Michael Adam
parent c064357428
commit 98d289d2e5

View File

@ -634,8 +634,8 @@ The last 50 lines of log messages:
f.close() f.close()
logs = os.path.join(gitroot, 'logs.tar.gz') logs = os.path.join(gitroot, 'logs.tar.gz')
send_email('autobuild failure on %s for task %s during %s' send_email('autobuild[%s] failure on %s for task %s during %s'
% (platform.node(), failed_task, failed_stage), % (options.branch, platform.node(), failed_task, failed_stage),
text, logs) text, logs)
def email_success(elapsed_time, log_base=None): 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 ''' % top_commit_msg
logs = os.path.join(gitroot, 'logs.tar.gz') 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) text, logs)
@ -768,7 +768,7 @@ else:
AUTOBUILD FAILURE 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: when trying to test %s with the following error:
%s %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() cleanup()
print(errstr) print(errstr)