Simplify variable to 1 line

[releng/builder.git] / jjb / autorelease / include-raw-autorelease-notify-build-failure.sh

diff --git a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh b/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
index b113636818c283e84ce03f942719b015a0784603..597d73a3d815ba29a056b74589224956787ce12e 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
+++ b/jjb/autorelease/include-raw-autorelease-notify-build-failure.sh
@@ -44,7 +44,7 @@ fi
 # Construct email subject & body
 PROJECT_STRING=${PROJECT:+" from $PROJECT"}
 SUBJECT="[release] Autorelease $STREAM failed to build $ARTIFACTID$PROJECT_STRING"
-BODY="Attention$PROJECT_STRING,
+BODY="Attention ${PROJECT:-"OpenDaylight"}-devs,
 
 Autorelease $STREAM failed to build $ARTIFACTID$PROJECT_STRING in build
 $BUILD_NUMBER. Attached is a snippet of the error message related to the
@@ -71,14 +71,14 @@ if [ ! -z "${ARTIFACTID}" ] && [[ "${BUILD_STATUS}" != "SUCCESS" ]]; then
     # 1. Full format:    ODL :: $PROJECT :: $ARTIFACTID
     # 2. Partial format: Building $ARTIFACTID
     sed -e "/\[INFO\] Building \(${ARTIFACTID} \|${ODL} :: ${PROJECT} :: ${ARTIFACTID} \)/,/Reactor Summary:/!d;//d" \
-          $CONSOLE_LOG > /tmp/error_msg
+          $CONSOLE_LOG > /tmp/error.txt
 
     if [ -n "${PROJECT}" ]; then
         RELEASE_EMAIL="${RELEASE_EMAIL}, ${PROJECT}-dev@opendaylight.org"
     fi
 
-    echo "${BODY}" | mail -a /tmp/error_msg \
-        -S "from=Jenkins <jenkins-dontreply@opendaylight.org>" \
+    echo "${BODY}" | mail -a /tmp/error.txt \
+        -r "Jenkins <jenkins-dontreply@opendaylight.org>" \
         -s "${SUBJECT}" "${RELEASE_EMAIL}"
 fi