Changeset 27541

Timestamp:

2013-06-04T19:35:21+12:00 (11 years ago)

Author:

ak19

Message:

Message being mailed now includes the html version of the report as an attachment. I can't yet work out why the mutt command can't send the version of the mail with attachment to greenstone mail (the command doesn't work from the command line either), although it can send the attachment to my own uni id. It's also possible to send the plain message without attachment to the greenstone id. Maybe the greenstone mail id has been set to block messages with attachments sent from linux mutt commands?

File:

• other-projects/nightly-tasks/diffcol/trunk/task (modified) (4 diffs)

other-projects/nightly-tasks/diffcol/trunk/task

@@ -217 +217 @@
     echo "</test>" >> $xmlout
 
-    # email out if failed
-    echo "Checking if failed... "
-    result=`java org.apache.xalan.xslt.Process -IN "$xmlout" -XSL "$TASK_HOME/xsl/passed-or-not.xsl"`
-    echo "result: "$result
-    if [ "$result" != "yes" ]; then
-        echo 'gsdl regression test for '$dateid' failed' | mail -s $1' Regression Test Failed' $MONITOR_EMAIL
-        #$WEBMASTER_EMAIL
-    fi
-    echo "done"
+    echo "done"
+
 }
 
@@ -231 +224 @@
     # ensure the upload directory exists 
     # before trying to transfer the xml and html files across
+    # if it already existed, clear it of contents
     if [ ! -d "$UPLOAD_DIR" ]; then
     mkdir -p "$UPLOAD_DIR";
+#    else
+#   rm $UPLOAD_DIR/*
     fi
 
     scp $DATA_DIR/*.xml $DATA_DIR/*.html $UPLOAD_DIR
+}
+
+function mail_simple_message() {
+    # email out brief failure message if failed                                                       
+    echo "Checking if failed... "
+    result=`java org.apache.xalan.xslt.Process -IN "$xmlout" -XSL "$TASK_HOME/xsl/passed-or-not.xsl"`
+    echo "result: "$result
+    if [ "$result" != "yes" ]; then
+        echo 'gsdl regression test for '$dateid' failed' | mail -s 'Regression Test Failed' $MONITOR_EMAIL #$WEBMASTER_EMAIL 
+    fi
+}
+
+
+function mail_with_report_attached() {
+    # http://stackoverflow.com/questions/17359/how-do-i-send-a-file-as-an-email-attachment-using-linux-command-line
+
+    #echo "This is the message body" | mutt -a "/path/to/file.to.attach" -s "subject of message" -- [email protected]
+
+
+    # email out with report attached, if the tests failed                                                      
+    echo "Checking if failed... "
+    result=`java org.apache.xalan.xslt.Process -IN "$xmlout" -XSL "$TASK_HOME/x\
+sl/passed-or-not.xsl"`
+    echo "result: "$result
+    if [ "$result" != "yes" ]; then
+    echo 'gsdl regression test for '$dateid' failed' | mutt -a $DATA_DIR'/report-'$dateid'.html' -s 'Regression Test Failed' -- $MONITOR_EMAIL
+    fi
+    echo "Sent mail with report attached."
 }
 
@@ -277 +301 @@
 elif [ "$action" == "run_test" ]; then
     run_test
+#   mail_simple_message
 elif [ "$action" == "summarise" ]; then
     summarise
 elif [ "$action" == "upload" ]; then
     upload
+    mail_simple_message
+    mail_with_report_attached
 elif [ "$action" == "all" ]; then
     setup_greenstone
@@ -286 +313 @@
     summarise
     upload
-fi
-
+    mail_with_report_attached
+fi
+