summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2016-08-10 12:44:26 +0200
committerMichael Adam <obnox@samba.org>2016-08-11 08:38:47 +0200
commit98d289d2e5162a23d15562b009d0edf20a55a56b (patch)
tree90e032147c8b2c2257e171508525904dea86d4e7 /script
parentc064357428799ebb9c8ac5e9bf3a081bdad45072 (diff)
downloadsamba-98d289d2e5162a23d15562b009d0edf20a55a56b.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
Diffstat (limited to 'script')
-rwxr-xr-xscript/autobuild.py10
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)