Updated Email Extended Publisher Plugin

Parameters inside triggers were not updated while the upper
parameters were changed, were staying as default. Updated
the implementation to make it take from the upper level.

Change-Id: I16fc3525fcdf0a8bf3aea3b8422f0f2ad26f9e24
Signed-off-by: Eren ATAS <eatas.contractor@libertyglobal.com>
This commit is contained in:
Eren ATAS 2020-09-15 13:26:11 +02:00
parent 3a05654787
commit 2a5acc24d6
4 changed files with 62 additions and 58 deletions
jenkins_jobs/modules
tests/publishers/fixtures

@ -2567,9 +2567,13 @@ def base_email_ext(registry, xml_parent, data, ttype):
XML.SubElement(trigger, "triggerScript").text = data["trigger-script"] XML.SubElement(trigger, "triggerScript").text = data["trigger-script"]
if plugin_version >= pkg_resources.parse_version("2.39"): if plugin_version >= pkg_resources.parse_version("2.39"):
XML.SubElement(email, "attachmentsPattern").text = "" mappings = [
XML.SubElement(email, "attachBuildLog").text = "false" ("attachments", "attachmentsPattern", ""),
XML.SubElement(email, "compressBuildLog").text = "false" ("attach-build-log", "attachBuildLog", False),
("compress-log", "compressBuildLog", False),
]
helpers.convert_mapping_to_xml(email, data, mappings, fail_required=True)
def email_ext(registry, xml_parent, data): def email_ext(registry, xml_parent, data):

@ -19,9 +19,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.AlwaysTrigger> </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger>
<hudson.plugins.emailext.plugins.trigger.UnstableTrigger> <hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
@ -39,9 +39,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.UnstableTrigger> </hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
<hudson.plugins.emailext.plugins.trigger.FirstFailureTrigger> <hudson.plugins.emailext.plugins.trigger.FirstFailureTrigger>
@ -59,9 +59,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
<failureCount>0</failureCount> <failureCount>0</failureCount>
</hudson.plugins.emailext.plugins.trigger.FirstFailureTrigger> </hudson.plugins.emailext.plugins.trigger.FirstFailureTrigger>
@ -80,9 +80,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.FirstUnstableTrigger> </hudson.plugins.emailext.plugins.trigger.FirstUnstableTrigger>
<hudson.plugins.emailext.plugins.trigger.NotBuiltTrigger> <hudson.plugins.emailext.plugins.trigger.NotBuiltTrigger>
@ -100,9 +100,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.NotBuiltTrigger> </hudson.plugins.emailext.plugins.trigger.NotBuiltTrigger>
<hudson.plugins.emailext.plugins.trigger.AbortedTrigger> <hudson.plugins.emailext.plugins.trigger.AbortedTrigger>
@ -120,9 +120,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.AbortedTrigger> </hudson.plugins.emailext.plugins.trigger.AbortedTrigger>
<hudson.plugins.emailext.plugins.trigger.RegressionTrigger> <hudson.plugins.emailext.plugins.trigger.RegressionTrigger>
@ -140,9 +140,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.RegressionTrigger> </hudson.plugins.emailext.plugins.trigger.RegressionTrigger>
<hudson.plugins.emailext.plugins.trigger.FailureTrigger> <hudson.plugins.emailext.plugins.trigger.FailureTrigger>
@ -160,9 +160,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.FailureTrigger> </hudson.plugins.emailext.plugins.trigger.FailureTrigger>
<hudson.plugins.emailext.plugins.trigger.SecondFailureTrigger> <hudson.plugins.emailext.plugins.trigger.SecondFailureTrigger>
@ -180,9 +180,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
<failureCount>0</failureCount> <failureCount>0</failureCount>
</hudson.plugins.emailext.plugins.trigger.SecondFailureTrigger> </hudson.plugins.emailext.plugins.trigger.SecondFailureTrigger>
@ -201,9 +201,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.ImprovementTrigger> </hudson.plugins.emailext.plugins.trigger.ImprovementTrigger>
<hudson.plugins.emailext.plugins.trigger.StillFailingTrigger> <hudson.plugins.emailext.plugins.trigger.StillFailingTrigger>
@ -221,9 +221,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.StillFailingTrigger> </hudson.plugins.emailext.plugins.trigger.StillFailingTrigger>
<hudson.plugins.emailext.plugins.trigger.SuccessTrigger> <hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
@ -241,9 +241,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.SuccessTrigger> </hudson.plugins.emailext.plugins.trigger.SuccessTrigger>
<hudson.plugins.emailext.plugins.trigger.FixedTrigger> <hudson.plugins.emailext.plugins.trigger.FixedTrigger>
@ -261,9 +261,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.FixedTrigger> </hudson.plugins.emailext.plugins.trigger.FixedTrigger>
<hudson.plugins.emailext.plugins.trigger.FixedUnhealthyTrigger> <hudson.plugins.emailext.plugins.trigger.FixedUnhealthyTrigger>
@ -281,9 +281,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.FixedUnhealthyTrigger> </hudson.plugins.emailext.plugins.trigger.FixedUnhealthyTrigger>
<hudson.plugins.emailext.plugins.trigger.StillUnstableTrigger> <hudson.plugins.emailext.plugins.trigger.StillUnstableTrigger>
@ -301,9 +301,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.StillUnstableTrigger> </hudson.plugins.emailext.plugins.trigger.StillUnstableTrigger>
<hudson.plugins.emailext.plugins.trigger.PreBuildTrigger> <hudson.plugins.emailext.plugins.trigger.PreBuildTrigger>
@ -321,9 +321,9 @@
<hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.FirstFailingBuildSuspectsRecipientProvider/>
<hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
</email> </email>
</hudson.plugins.emailext.plugins.trigger.PreBuildTrigger> </hudson.plugins.emailext.plugins.trigger.PreBuildTrigger>
</configuredTriggers> </configuredTriggers>
@ -333,8 +333,8 @@
<attachmentsPattern>*/foo*.log</attachmentsPattern> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<presendScript>cancel=true</presendScript> <presendScript>cancel=true</presendScript>
<postsendScript>cancel=true</postsendScript> <postsendScript>cancel=true</postsendScript>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>true</compressBuildLog>
<saveOutput>true</saveOutput> <saveOutput>true</saveOutput>
<disabled>false</disabled> <disabled>false</disabled>
<replyTo>foo@example.com</replyTo> <replyTo>foo@example.com</replyTo>

@ -6,8 +6,8 @@ publishers:
content-type: html content-type: html
subject: Subject for Build ${BUILD_NUMBER} subject: Subject for Build ${BUILD_NUMBER}
body: The build has finished body: The build has finished
attach-build-log: false attach-build-log: true
compress-log: false compress-log: true
attachments: "*/foo*.log" attachments: "*/foo*.log"
always: true always: true
unstable: true unstable: true

@ -13,7 +13,7 @@
<recipientProviders> <recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>false</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>false</compressBuildLog>
</email> </email>
@ -27,7 +27,7 @@
<recipientProviders> <recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>false</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>false</compressBuildLog>
</email> </email>
@ -41,7 +41,7 @@
<recipientProviders> <recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/> <hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders> </recipientProviders>
<attachmentsPattern/> <attachmentsPattern>*/foo*.log</attachmentsPattern>
<attachBuildLog>false</attachBuildLog> <attachBuildLog>false</attachBuildLog>
<compressBuildLog>false</compressBuildLog> <compressBuildLog>false</compressBuildLog>
</email> </email>