From 79e93def6e6547e9aaa170378afed310984a9291 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 29 Oct 2014 00:03:48 -0400
Subject: [PATCH] Change email-ext macros to allow modifying the recipients and
 subject prefix

Change-Id: I3a5a1a921dccd200e0117c75a4457dd827330f00
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/releng-jobs.yaml   |  8 ++++++++
 jjb/releng-macros.yaml | 11 +++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index cb87eedda..afbc6212d 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -49,6 +49,10 @@
             source /opt/virtualenv/jenkins-job-builder/bin/activate
             jenkins-jobs test jjb/
 
+    publishers:
+        - email-notification:
+            email-prefix: '[releng]'
+
 - job-template:
     name: 'builder-merge'
 
@@ -95,3 +99,7 @@
         - shell: |
             source /opt/virtualenv/jenkins-job-builder/bin/activate
             jenkins-jobs update jjb/
+
+    publishers:
+        - email-notification:
+            email-prefix: '[releng]'
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index f41ad0ca1..673a74b4e 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -60,11 +60,14 @@
     name: email-notification
     publishers:
         - email-ext:
-            recipients: '$DEFAULT_RECIPIENTS'
-            reply-to: '$DEFAULT_REPLYTO'
+            recipients: 'jenkins@lists.opendaylight.org'
+            reply-to:
             content-type: default
-            subject: '$DEFAULT_SUBJECT'
-            body: '$DEFAULT_CONTENT'
+            subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
+            body: |
+                $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
+
+                Check console output at $BUILD_URL to view the results.
             unstable: true
             fixed: true
             send-to:
-- 
2.36.6