X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Finclude-raw-autorelease-notify-build-failure.sh;h=b113636818c283e84ce03f942719b015a0784603;hb=85be5048692d94006f7cbc090866595bc1cd179d;hp=7cf565d5e897f8160f4be49d6667e4a8cee1258a;hpb=e6ff4a58b08bb0fcf09540c3ecb259805a92c315;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh b/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
index 7cf565d5e..b11363681 100644
--- a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
+++ b/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
@@ -15,10 +15,10 @@ CONSOLE_LOG="/tmp/autorelease-build.log"
 STREAM=${JOB_NAME#*-*e-}
 
 # get console logs
-wget -O $CONSOLE_LOG ${BUILD_URL}consoleText
+wget -O "$CONSOLE_LOG" "${BUILD_URL}consoleText"
 
 # extract the failing project or artifactid
-REACTOR_INFO=`awk '/Reactor Summary:/ { flag=1 }
+REACTOR_INFO=$(awk '/Reactor Summary:/ { flag=1 }
           flag {
              if ( sub(/^\[(INFO)\]/,"") && sub(/FAILURE \[.*/,"") ) {
                  gsub(/[[:space:]]*::[[:space:]]*/,"::")
@@ -26,19 +26,19 @@ REACTOR_INFO=`awk '/Reactor Summary:/ { flag=1 }
                  print
              }
           }
-          /Final Memory:/ { flag=0 }' $CONSOLE_LOG`
+          /Final Memory:/ { flag=0 }' $CONSOLE_LOG)
 
 # check for project format
 if [[ ${REACTOR_INFO} =~ .*::*.*::*. ]]; then
     # extract project and artifactid from full format
-    ODL=`echo ${REACTOR_INFO} | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $1); print $1 }'`
-    PROJECT=`echo ${REACTOR_INFO} | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2 }'`
-    ARTIFACTID=`echo ${REACTOR_INFO} | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $3); print $3 }'`
+    ODL=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $1); print $1 }')
+    PROJECT=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2 }')
+    ARTIFACTID=$(echo "${REACTOR_INFO}" | awk -F'::' '{ gsub(/^[ \t]+|[ \t]+$/, "", $3); print $3 }')
 else
     # set ARTIFACTID to partial format
     ODL=""
     PROJECT=""
-    ARTIFACTID=`echo ${REACTOR_INFO} | awk '{ gsub(/^[ \t]+|[ \t]+$/, ""); print }'`
+    ARTIFACTID=$(echo "${REACTOR_INFO}" | awk '{ gsub(/^[ \t]+|[ \t]+$/, ""); print }')
 fi
 
 # Construct email subject & body
@@ -63,9 +63,8 @@ ODL releng/autorelease team
 "
 
 # check if remote staging is complete successfully
-BUILD_STATUS=`awk '/\[INFO\] Remote staging finished/{flag=1;next} \
-                   /Total time:/{flag=0}flag' $CONSOLE_LOG \
-                   | grep '\] BUILD' | awk '{print $3}'`
+BUILD_STATUS=$(awk '/\[INFO\] Remote staging finished/{flag=1;next}/Total time:/{flag=0}flag' $CONSOLE_LOG \
+                   | grep '\] BUILD' | awk '{print $3}')
 
 if [ ! -z "${ARTIFACTID}" ] && [[ "${BUILD_STATUS}" != "SUCCESS" ]]; then
     # project search pattern should handle both scenarios
@@ -78,7 +77,9 @@ if [ ! -z "${ARTIFACTID}" ] && [[ "${BUILD_STATUS}" != "SUCCESS" ]]; then
         RELEASE_EMAIL="${RELEASE_EMAIL}, ${PROJECT}-dev@opendaylight.org"
     fi
 
-    echo "${BODY}" | mail -a /tmp/error_msg -s "${SUBJECT}" "${RELEASE_EMAIL}"
+    echo "${BODY}" | mail -a /tmp/error_msg \
+        -S "from=Jenkins <jenkins-dontreply@opendaylight.org>" \
+        -s "${SUBJECT}" "${RELEASE_EMAIL}"
 fi
 
 rm $CONSOLE_LOG