[FIXED JENKINS-15324] Aggregate build results if a failed build is

caused by a plugin threshold.
jenkinsci · Feb 14, 2013 · b506c41 · b506c41
1 parent 3b9fbe4
commit b506c41
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/main/java/hudson/plugins/analysis/core/MavenResultAction.java b/src/main/java/hudson/plugins/analysis/core/MavenResultAction.java
@@ -103,15 +103,14 @@ public String getSmallImageName() {
      *            Newly completed build.
      */
     public void update(final Map<MavenModule, List<MavenBuild>> moduleBuilds, final MavenBuild newBuild) {
-        if (newBuild.getResult().isBetterThan(Result.FAILURE)) {
-            MavenResultAction<T> additionalAction = newBuild.getAction(getIndividualActionType());
-            MavenModule project = newBuild.getProject();
-            if (additionalAction != null && !getModules().contains(project)) {
-                getModules().add(project);
-
-                T existingResult = delegate.getResult();
-                T additionalResult = additionalAction.getResult();
+        MavenResultAction<T> additionalAction = newBuild.getAction(getIndividualActionType());
+        MavenModule project = newBuild.getProject();
+        if (additionalAction != null && !getModules().contains(project)) {
+            T existingResult = delegate.getResult();
+            T additionalResult = additionalAction.getResult();
 
+            if (newBuild.getResult().isBetterThan(Result.FAILURE) || additionalResult.getPluginResult().isWorseOrEqualTo(Result.FAILURE)) {
+                getModules().add(project);
                 setResult(createAggregatedResult(existingResult, additionalResult));
 
                 copySourceFilesToModuleBuildFolder(newBuild);