Simplify post-run steps for continuous benchmarking (#2583)

Put the entire results directory into a zip archive on the local disk.
Preserve the directory structure in the archive (previously the archive
was flat) and actually compress the contents (previous they were not
compressed).  Do not attempt to send an email.

toolset/lifecycle/post-run-tests/email-results.py

@@ -1,92 +0,0 @@
-#!/usr/bin/python
-#
-# Zips the results file and emails it to a specified address.
-#
-# @author A. Shawn Bandy
-#
-import smtplib
-from os.path import basename
-from email.mime.application import MIMEApplication
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from email.mime.base import MIMEBase
-from email import encoders
-from email.utils import COMMASPACE, formatdate
-import zipfile
-import os
-import subprocess
-import tempfile
-
-#
-# finds a file of the given name in the tree below path
-# http://stackoverflow.com/a/1724723
-#
-def find(name, path):
-    for root, dirs, files in os.walk(path):
-        if name in files:
-            return os.path.join(root, name)
-
-#
-# Generate body of email and attach to message
-#
-message = MIMEMultipart()
-body = "preview run complete. results attached"
-message.attach(MIMEText(body))
-#
-# Get results file, zip it and attach to the email
-#
-resultsFileLocation = os.environ['TFB_REPOPARENT'] + "/" \
-    + os.environ['TFB_REPONAME'] + "/results/latest/results.json"
-temporaryFile = tempfile.TemporaryFile(prefix='results', suffix='.zip')
-zipFile = zipfile.ZipFile(temporaryFile, 'w')
-zipFile.write(resultsFileLocation)
-zipFile.close()
-temporaryFile.seek(0)
-#
-#Set up the email to be sent to the mailing list
-#
-message['From'] = os.environ['TFB_MAILING_FROM']
-message['To'] = os.environ['TFB_MAILINGLIST']
-message['Date'] = formatdate(localtime=True)
-message['Subject'] = subprocess.check_output(["git", "describe", "--always"])
-#
-# Zip in memory and email results
-#
-resultsZipped = MIMEBase('application', 'zip')
-resultsZipped.set_payload(temporaryFile.read())
-encoders.encode_base64(resultsZipped)
-resultsZipped.add_header('Content-Disposition', 'attachment', \
-  filename='results.json.zip')
-message.attach(resultsZipped)
-
-#
-# Attach the .commit file
-#
-commitFileLocation = os.environ['TFB_REPOPARENT'] + "/" \
-    + os.environ['TFB_REPONAME'] + "/results/.commit"
-attachment = MIMEBase('application', 'octet-stream')
-attachment.set_payload(open(commitFileLocation, "rb").read())
-encoders.encode_base64(attachment)
-attachment.add_header('Content-Disposition', 'attachment; filename=".commit"')
-message.attach(attachment)
-
-#
-# Find and attach the metadata file
-#
-metadataLocation = find("test_metadata.json", os.environ['TFB_REPOPARENT'] + "/" \
-    + os.environ['TFB_REPONAME'] + "/results")
-if metadataLocation is not None:
-  attachment = MIMEBase('application', 'octet-stream')
-  attachment.set_payload(open(metadataLocation, "rb").read())
-  encoders.encode_base64(attachment)
-  attachment.add_header('Content-Disposition', 'attachment; filename="test_metadata.json"')
-  message.attach(attachment)
-
-
-#
-# Send the message and close the collection
-#
-smtp = smtplib.SMTP('smtp.techempower.com')
-smtp.sendmail(os.environ['TFB_MAILING_FROM'], os.environ['TFB_MAILINGLIST'], \
-    message.as_string())
-smtp.close()

toolset/lifecycle/post-run-tests/keep-logs.py

@@ -16,29 +16,19 @@ import shutil
 #
 path_in = os.path.abspath(os.path.normpath(os.path.expanduser(os.path.join( \
     os.environ['TFB_REPOPARENT'], os.environ['TFB_REPONAME'], \
-    'results/latest/logs'))))
+    'results'))))
 date_time = datetime.datetime.now()
 dt_folder = date_time.strftime('%Y%m%d%H%M%S')
 path_out = os.path.abspath(os.path.join(os.environ['TFB_LOGSFOLDER'], \
     dt_folder))
-# Step through each folder in the TFB log folder...
-for folder in os.listdir(path_in):
-  if not os.path.exists(path_out):
-    os.makedirs(path_out)
-  zip_file = zipfile.ZipFile(path_out + '/' + folder + '.zip', 'w')
-# ... walk the folder structure ...
-  for root, directories, files in os.walk(os.path.join(path_in, folder), 'w', \
-        zipfile.ZIP_DEFLATED):
-# ... and add to the zip file.   
-    for file in files:
-      try:
-        zip_file.write(os.path.abspath(os.path.join(root, file)), \
-            arcname=file)
-      except OSError as err:
-        print "An OSError occurred while writing to a log zip file for {0}: \
-            {1}".format(file, err)
-  zip_file.close()
-path_results_in = os.path.abspath(os.path.normpath(os.path.expanduser(os.path.join( \
-    os.environ['TFB_REPOPARENT'], os.environ['TFB_REPONAME'], \
-    'results'))))
-shutil.copytree(path_results_in, path_out + '/results')
+
+if not os.path.exists(path_out):
+  os.makedirs(path_out)
+
+zip_file = zipfile.ZipFile(path_out + '/results.zip', 'w', zipfile.ZIP_DEFLATED)
+
+for root, dirs, files in os.walk(path_in):
+  for file in files:
+    zip_file.write(os.path.join(root, file))
+
+zip_file.close()