Merge "Adding second failure option to the email-ext module"

This commit is contained in:
Jenkins 2014-06-19 09:05:06 +00:00 committed by Gerrit Code Review
commit 463c84f055
3 changed files with 16 additions and 0 deletions
jenkins_jobs/modules
tests/publishers/fixtures

@ -1368,6 +1368,8 @@ def email_ext(parser, xml_parent, data):
:arg bool regression: Send an email if there is a regression
(default false)
:arg bool failure: Send an email if the build fails (default true)
:arg bool second-failure: Send an email for the second failure
(default false)
:arg bool improvement: Send an email if the build improves (default false)
:arg bool still-failing: Send an email if the build is still failing
(default false)
@ -1416,6 +1418,8 @@ def email_ext(parser, xml_parent, data):
base_email_ext(parser, ctrigger, data, 'RegressionTrigger')
if data.get('failure', True):
base_email_ext(parser, ctrigger, data, 'FailureTrigger')
if data.get('second-failure', False):
base_email_ext(parser, ctrigger, data, 'SecondFailureTrigger')
if data.get('improvement', False):
base_email_ext(parser, ctrigger, data, 'ImprovementTrigger')
if data.get('still-failing', False):

@ -81,6 +81,17 @@
<sendToRecipientList>true</sendToRecipientList>
</email>
</hudson.plugins.emailext.plugins.trigger.FailureTrigger>
<hudson.plugins.emailext.plugins.trigger.SecondFailureTrigger>
<email>
<recipientList/>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>true</sendToDevelopers>
<sendToRequester>true</sendToRequester>
<includeCulprits>true</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
</email>
</hudson.plugins.emailext.plugins.trigger.SecondFailureTrigger>
<hudson.plugins.emailext.plugins.trigger.ImprovementTrigger>
<email>
<recipientList/>

@ -14,6 +14,7 @@ publishers:
aborted: true
regression: true
failure: true
second-failure: true
improvement: true
still-failing: true
success: true