Changeset 989 for vendor/current/script

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/script

Files:

• autobuild.py (modified) (5 diffs)
• release.sh (modified) (6 diffs)

vendor/current/script/autobuild.py

@@ -561 +561 @@
 
 def email_failure(status, failed_task, failed_stage, failed_tag, errstr,
-                  elapsed_time, log_base=None):
+                  elapsed_time, log_base=None, add_log_tail=True):
     '''send an email to options.email about the failure'''
     elapsed_minutes = elapsed_time / 60.0
@@ -599 +599 @@
 ''' % (log_base, failed_tag, log_base, failed_tag, log_base, top_commit_msg)
 
+    if add_log_tail:
+        f = open("%s/%s.stdout" % (gitroot, failed_tag), 'r')
+        lines = f.readlines()
+        log_tail = "".join(lines[-50:])
+        num_lines = len(lines)
+        if num_lines < 50:
+            # Also include stderr (compile failures) if < 50 lines of stdout
+            f = open("%s/%s.stderr" % (gitroot, failed_tag), 'r')
+            log_tail += "".join(f.readlines()[-(50-num_lines):])
+
+        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),
+    send_email('autobuild[%s] failure on %s for task %s during %s'
+               % (options.branch, platform.node(), failed_task, failed_stage),
                text, logs)
 
@@ -632 +649 @@
 
     logs = os.path.join(gitroot, 'logs.tar.gz')
-    send_email('autobuild sucess on %s ' % platform.node(),
+    send_email('autobuild[%s] success on %s' % (options.branch, platform.node()),
                text, logs)
 
@@ -734 +751 @@
 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:
 
@@ -743 +760 @@
 ####################################################################
 
-''' % (platform.node(), elapsed_minutes, failed_task, errstr)
+''' % (options.branch, platform.node(), elapsed_minutes, failed_task, errstr)
 
 cleanup()

vendor/current/script/release.sh

@@ -663 +663 @@
                 echo ""
                 echo "The uncompressed tarballs and patch files have been signed"
-                echo "using GnuPG (ID 6568B7EA).  The source code can be downloaded"
+                echo "using GnuPG (ID ${GPG_KEYID}).  The source code can be downloaded"
                 echo "from:"
                 echo ""
@@ -846 +846 @@
                 echo ""
                 echo "The uncompressed tarballs and patch files have been signed"
-                echo "using GnuPG (ID 6568B7EA).  The source code can be downloaded"
+                echo "using GnuPG (ID ${GPG_KEYID}).  The source code can be downloaded"
                 echo "from:"
                 echo ""
@@ -1053 +1053 @@
 
         test -z "${GPG_KEYID-}"  && {
-                GPG_KEYID='13084025'
+                GPG_KEYID='4793916113084025'
         }
 
@@ -1072 +1072 @@
 
         test -z "${GPG_KEYID-}"  && {
-                GPG_KEYID='6568B7EA'
+                GPG_KEYID='6F33915B6568B7EA'
         }
 
@@ -1093 +1093 @@
 
         test -z "${GPG_KEYID-}"  && {
-                GPG_KEYID='6568B7EA'
+                GPG_KEYID='6F33915B6568B7EA'
         }
 
@@ -1115 +1115 @@
 
         test -z "${GPG_KEYID-}"  && {
-                GPG_KEYID='6568B7EA'
+                GPG_KEYID='6F33915B6568B7EA'
         }