Revert "autobuild: Return the last 50 log lines"
authorStefan Metzmacher <metze@samba.org>
Wed, 23 Mar 2016 10:07:08 +0000 (11:07 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 23 Mar 2016 17:59:17 +0000 (18:59 +0100)
This reverts commit aab2f39bb7ff330fbb01da4021c096e69a429d2e.

This breaks if log_base is an https url...

Traceback (most recent call last):
  File "script/autobuild.py", line 744, in <module>
    elapsed_time, log_base=options.log_base)
  File "script/autobuild.py", line 608, in email_failure
    f = open("%s/%s.stdout" % (log_base, failed_tag), 'r')
IOError: [Errno 2] No such file or directory:
'https://git.samba.org/uri/samba-autobuild/ctdb.stdout'

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Mar 23 18:59:17 CET 2016 on sn-devel-144

script/autobuild.py

index 13be1b6a856a88f1aa1833f273259f180600228d..4cad92033399144d5dbf5d4a0eb686d1be76d650 100755 (executable)
@@ -566,7 +566,7 @@ def send_email(subject, text, log_tar):
     s.quit()
 
 def email_failure(status, failed_task, failed_stage, failed_tag, errstr,
-                  elapsed_time, log_base=None, add_log_tail=True):
+                  elapsed_time, log_base=None):
     '''send an email to options.email about the failure'''
     elapsed_minutes = elapsed_time / 60.0
     user = os.getenv("USER")
@@ -604,17 +604,6 @@ The top commit for the tree that was built was:
 
 ''' % (log_base, failed_tag, log_base, failed_tag, log_base, top_commit_msg)
 
-    if add_log_tail:
-        f = open("%s/%s.stdout" % (log_base, failed_tag), 'r')
-        log_tail = "".join(f.readlines()[-50:])
-
-        text += '''
-The last 50 lines of log messages:
-
-%s
-    ''' % log_tail
-        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),