diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index 5567cd7db..4702c8113 100755 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -2471,6 +2471,12 @@ def base_email_ext(registry, xml_parent, data, ttype): XML.SubElement(email, "sendToRecipientList").text = str( "recipients" in data["send-to"] ).lower() + if "upstream-committers" in data["send-to"]: + recipient_providers = XML.SubElement(email, "recipientProviders") + XML.SubElement( + recipient_providers, + "hudson.plugins.emailext.plugins.recipients.UpstreamComitterRecipientProvider", + ).text = "" else: XML.SubElement(email, "sendToRequester").text = "false" XML.SubElement(email, "sendToDevelopers").text = "false" @@ -2554,6 +2560,7 @@ def email_ext(registry, xml_parent, data): * **requester** (disabled by default) * **culprits** (disabled by default) * **recipients** (enabled by default) + * **upstream-committers** (>=2.39) (disabled by default) Example: diff --git a/tests/publishers/fixtures/email-ext001.xml b/tests/publishers/fixtures/email-ext001.xml index a735ad6f1..48f3fc8a9 100644 --- a/tests/publishers/fixtures/email-ext001.xml +++ b/tests/publishers/fixtures/email-ext001.xml @@ -13,6 +13,9 @@ true true true + + + @@ -24,6 +27,9 @@ true true true + + + @@ -35,6 +41,9 @@ true true true + + + @@ -46,6 +55,9 @@ true true true + + + @@ -57,6 +69,9 @@ true true true + + + @@ -68,6 +83,9 @@ true true true + + + @@ -79,6 +97,9 @@ true true true + + + @@ -90,6 +111,9 @@ true true true + + + @@ -101,6 +125,9 @@ true true true + + + @@ -112,6 +139,9 @@ true true true + + + @@ -123,6 +153,9 @@ true true true + + + @@ -134,6 +167,9 @@ true true true + + + @@ -145,6 +181,9 @@ true true true + + + @@ -156,6 +195,9 @@ true true true + + + @@ -167,6 +209,9 @@ true true true + + + @@ -178,6 +223,9 @@ true true true + + + diff --git a/tests/publishers/fixtures/email-ext001.yaml b/tests/publishers/fixtures/email-ext001.yaml index 9ba603401..7aaa30f0b 100644 --- a/tests/publishers/fixtures/email-ext001.yaml +++ b/tests/publishers/fixtures/email-ext001.yaml @@ -33,3 +33,4 @@ publishers: - requester - culprits - recipients + - upstream-committers