[FIXED JENKINS-5695] Jenkins sending too many emails for Maven module…

… failure Originally-Committed-As: 4b2e23b197fa40612fcf59c5eb3dd81a8a5fd654
jenkinsci · Dec 25, 2011 · 31ccddb · 31ccddb
1 parent 682693f
commit 31ccddb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/src/main/java/hudson/maven/MavenModuleSet.java b/src/main/java/hudson/maven/MavenModuleSet.java
@@ -185,6 +185,14 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
      * @since 1.223
      */
     private boolean usePrivateRepository = false;
+
+   /**
+    * If true, the build will send a failure e-mail for each failing maven module.
+    * Defaults to <code>true</code> to simulate old behavior. 
+    * <p>
+    * see JENKINS-5695. 
+    */
+    private Boolean perModuleEmail = Boolean.TRUE;
 
     /**
      * If true, do not automatically schedule a build when one of the project dependencies is built.
@@ -436,6 +444,10 @@ public boolean usesPrivateRepository() {
         return usePrivateRepository;
     }
 
+    public boolean isPerModuleEmail() {
+        return perModuleEmail;
+    }
+
     public boolean ignoreUpstremChanges() {
         return ignoreUpstremChanges;
     }
@@ -665,6 +677,10 @@ public ModuleName call(MavenModule module) {
         }
         postbuilders.setOwner(this);
 
+        if(perModuleEmail == null){
+            perModuleEmail = Boolean.TRUE;
+        }
+
         updateTransientActions();
     }
 
@@ -987,6 +1003,7 @@ protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
         mavenName = req.getParameter("maven_version");
         aggregatorStyleBuild = !req.hasParameter("maven.perModuleBuild");
         usePrivateRepository = req.hasParameter("maven.usePrivateRepository");
+        perModuleEmail = req.hasParameter("maven.perModuleEmail");
         ignoreUpstremChanges = !json.has("triggerByDependency");
         runHeadless = req.hasParameter("maven.runHeadless");
         incrementalBuild = req.hasParameter("maven.incrementalBuild");

diff --git a/src/main/java/hudson/maven/reporters/MavenMailer.java b/src/main/java/hudson/maven/reporters/MavenMailer.java
@@ -48,9 +48,12 @@ public class MavenMailer extends MavenReporter {
     public String recipients;
     public boolean dontNotifyEveryUnstableBuild;
     public boolean sendToIndividuals;
+    public boolean perModuleEmail;
 
     public boolean end(MavenBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
-        new MailSender(recipients,dontNotifyEveryUnstableBuild,sendToIndividuals).execute(build,listener);
+        if(perModuleEmail) {
+            new MailSender(recipients,dontNotifyEveryUnstableBuild,sendToIndividuals).execute(build,listener);
+        }
         return true;
     }
 
@@ -74,6 +77,7 @@ public MavenReporter newInstance(StaplerRequest req, JSONObject formData) throws
             MavenMailer m = new MavenMailer();
             req.bindParameters(m,"mailer_");
             m.dontNotifyEveryUnstableBuild = req.getParameter("mailer_notifyEveryUnstableBuild")==null;
+            m.perModuleEmail = req.hasParameter("maven.perModuleEmail");
             return m;
         }
     }

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
@@ -98,6 +98,8 @@ THE SOFTWARE.
         checked="${!it.aggregatorStyleBuild}" />
       <f:optionalBlock name="maven.usePrivateRepository" title="${%Use private Maven repository}" help="/plugin/maven-plugin/private-repository.html"
         checked="${it.usesPrivateRepository()}" />
+      <f:optionalBlock name="maven.perModuleEmail" title="${%Send e-mail for each failed module}" help="/plugin/maven-plugin/per-module-email.html"
+        checked="${it.isPerModuleEmail()}" />
       <f:optionalBlock name="maven.resolveDependencies" title="${%Resolve Dependencies during Pom parsing}" 
         checked="${it.isResolveDependencies()}" /> 
       <f:optionalBlock name="maven.runHeadless" title="${%Run Headless}" help="/plugin/maven-plugin/run-headless.html"

diff --git a/src/main/webapp/per-module-email.html b/src/main/webapp/per-module-email.html
@@ -0,0 +1,3 @@
+<div>
+  If checked, Jenkins will send an e-mail notifications for each module (e.g. failed, unstable).
+</div>