[FIXED JENKINS-11219] don't run on MatrixAgregator

jenkinsci · Jul 30, 2013 · 754a85c · 754a85c
1 parent 8448895
commit 754a85c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/PostBuildScript.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/PostBuildScript.java
@@ -61,19 +61,20 @@ public MatrixAggregator createAggregator(MatrixBuild build, Launcher launcher, B
         return new MatrixAggregator(build, launcher, listener) {
             @Override
             public boolean endBuild() throws InterruptedException, IOException {
-                return _perform(build, launcher, listener);
+                if (!executeOnMatrixNodes)
+                    return _perform(build, launcher, listener);
+                else
+                    return true;
             }
         };
     }
 
     @Override
     public boolean perform(AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws InterruptedException, IOException {
         Job job = build.getProject();
-        boolean matrix = isMatrixProject(job);
         boolean axe = isMatrixAxe(job);
         if (   (axe && executeOnMatrixNodes)     // matrix axe, and set to execute on axes' nodes
-            || (matrix && !executeOnMatrixNodes) // matrix head, and set to execute on head
-            || (!matrix && !axe)) {              // neither matrix head nor axe
+            || (!axe)) {                         // neither matrix head nor axe
             return _perform(build, launcher, listener);
         }
         return true;