From 032500ddb97050256d3ae3faea46b700d4f0836d Mon Sep 17 00:00:00 2001
From: Brian Herrera <briher@amazon.com>
Date: Thu, 6 May 2021 09:23:12 -0700
Subject: [PATCH 1/3] Fix email notifications and limit to watched branches

---
 scripts/build/Jenkins/Jenkinsfile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index bc770e42f7..0adf1459c3 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -549,15 +549,13 @@ finally {
                 message:"${currentBuild.currentResult}:${BUILD_URL}:${env.RECREATE_VOLUME}:${env.CLEAN_OUTPUT_DIRECTORY}:${env.CLEAN_ASSETS}"
             )
         }
-        step([
-            $class: 'Mailer',
-            notifyEveryUnstableBuild: true,
-            sendToIndividuals: true,
-            recipients: emailextrecipients([
-                [$class: 'CulpritsRecipientProvider'],
-                [$class: 'RequesterRecipientProvider']
-            ])
-        ])
+        if (env.WATCHED_BRANCHES.tokenize(',').contains(branchName)) {
+            node('controller') {
+                step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 
+                    emailextrecipients([[$class: 'CulpritsRecipientProvider']])
+                ])
+            }
+        }
     } catch(Exception e) {
     }
 }

From bdfee639d9185c687dc17262da546c3fea7cb55f Mon Sep 17 00:00:00 2001
From: Brian Herrera <briher@amazon.com>
Date: Thu, 6 May 2021 09:38:31 -0700
Subject: [PATCH 2/3] Update formatting

---
 scripts/build/Jenkins/Jenkinsfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index 0adf1459c3..1d2b4c35f7 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -551,8 +551,13 @@ finally {
         }
         if (env.WATCHED_BRANCHES.tokenize(',').contains(branchName)) {
             node('controller') {
-                step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 
-                    emailextrecipients([[$class: 'CulpritsRecipientProvider']])
+                step([
+                    $class: 'Mailer', 
+                    notifyEveryUnstableBuild: true, 
+                    recipients: emailextrecipients([
+                        [$class: 'CulpritsRecipientProvider'],
+                        [$class: 'RequesterRecipientProvider']
+                    ])
                 ])
             }
         }

From 618a02ff137aae0609e734ebc1bcc101b3377d36 Mon Sep 17 00:00:00 2001
From: Brian Herrera <briher@amazon.com>
Date: Thu, 6 May 2021 10:43:44 -0700
Subject: [PATCH 3/3] Update step to also send email to build requestor on all
 branches

---
 scripts/build/Jenkins/Jenkinsfile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index 1d2b4c35f7..f85b0b5ef4 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -549,17 +549,16 @@ finally {
                 message:"${currentBuild.currentResult}:${BUILD_URL}:${env.RECREATE_VOLUME}:${env.CLEAN_OUTPUT_DIRECTORY}:${env.CLEAN_ASSETS}"
             )
         }
-        if (env.WATCHED_BRANCHES.tokenize(',').contains(branchName)) {
-            node('controller') {
-                step([
-                    $class: 'Mailer', 
-                    notifyEveryUnstableBuild: true, 
-                    recipients: emailextrecipients([
-                        [$class: 'CulpritsRecipientProvider'],
-                        [$class: 'RequesterRecipientProvider']
-                    ])
-                ])
+        node('controller') {
+            emailRecipients = [[$class: 'RequesterRecipientProvider']]
+            if (env.WATCHED_BRANCHES.tokenize(',').contains(branchName)) {
+                emailRecipients.add([$class: 'CulpritsRecipientProvider'])
             }
+            step([
+                $class: 'Mailer', 
+                notifyEveryUnstableBuild: true, 
+                recipients: emailextrecipients(emailRecipients)
+            ])
         }
     } catch(Exception e) {
     }