Merge pull request #604 from aws-lumberyard-dev/build-strike/SPEC-6668

[SPEC-6668] Fix email notifications and limit to watched branches
2021-05-06 14:23:07 -07:00
parent 6d338137a9 618a02ff13
commit 854a1fa201
1 changed files with 10 additions and 8 deletions
@@ -549,15 +549,17 @@ 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']
+        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) {
    }
 }