[FIXED HUDSON-4739] Fixed "even if unstable" option for triggering other projects

from a Maven type project; added unit test.


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23455 71c3de6d-444a-0410-be80-ed276b4c234a

maven-plugin/src/main/java/hudson/maven/AbstractMavenBuild.java

@@ -32,6 +32,7 @@ import hudson.model.Hudson;
 import hudson.model.Result;
 import hudson.model.Run;
 import hudson.model.Cause.UpstreamCause;
+import hudson.tasks.BuildTrigger;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,7 +42,7 @@ import java.util.Set;
 public abstract class AbstractMavenBuild<P extends AbstractMavenProject<P,B>,B extends AbstractMavenBuild<P,B>> extends AbstractBuild<P, B>  {
 
     /**
-     * Extra versbose debug switch.
+     * Extra verbose debug switch.
      */
     public static boolean debug = false;
     
@@ -59,11 +60,16 @@ public abstract class AbstractMavenBuild<P extends AbstractMavenProject<P,B>,B e
     
     /**
      * Schedules all the downstream builds.
+     * Returns immediately if build result doesn't meet the required level
+     * (as specified by {@link BuildTrigger}, or {@link Result#SUCCESS} if none).
      *
      * @param listener
      *      Where the progress reports go.
      */
     protected final void scheduleDownstreamBuilds(BuildListener listener) {
+        BuildTrigger bt = getParent().getPublishersList().get(BuildTrigger.class);
+        if (getResult().isWorseThan(bt!=null ? bt.getThreshold() : Result.SUCCESS)) return;
+
         // trigger dependency builds
         for( AbstractProject<?,?> down : getParent().getDownstreamProjects()) {
             if(debug)

maven-plugin/src/main/java/hudson/maven/MavenBuild.java

@@ -226,6 +226,7 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
     /**
      * Backdoor for {@link MavenModuleSetBuild} to assign workspaces for modules.
      */
+    @Override
     protected void setWorkspace(FilePath path) {
         super.setWorkspace(path);
     }
@@ -255,6 +256,7 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
                 super(buildProxy);
             }
 
+            @Override
             public void executeAsync(final BuildCallable<?,?> program) throws IOException {
                 futures.add(Channel.current().callAsync(new AsyncInvoker(core,program)));
             }
@@ -547,9 +549,9 @@ public class MavenBuild extends AbstractMavenBuild<MavenModule,MavenBuild> {
                 reporter.end(MavenBuild.this,launcher,listener);
         }
 
+        @Override
         public void cleanUp(BuildListener listener) throws Exception {
-            if(getResult().isBetterOrEqualTo(Result.SUCCESS))
-                scheduleDownstreamBuilds(listener);
+            scheduleDownstreamBuilds(listener);
         }
     }
 

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -234,6 +234,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
         return r;
     }
 
+    @Override
     public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
         // map corresponding module build under this object
         if(token.indexOf('$')>0) {
@@ -608,9 +609,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             if(project.isAggregatorStyleBuild()) {
                 // schedule downstream builds. for non aggregator style builds,
                 // this is done by each module
-                if(getResult().isBetterOrEqualTo(Result.SUCCESS)) {
-                	scheduleDownstreamBuilds(listener);
-                }
+                scheduleDownstreamBuilds(listener);
             }
 
 	    MavenMailer mailer = project.getReporters().get(MavenMailer.class);
@@ -660,6 +659,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                 super(core);
             }
 
+            @Override
             public void executeAsync(final BuildCallable<?,?> program) throws IOException {
                 futures.add(Channel.current().callAsync(new AsyncInvoker(core,program)));
             }
@@ -683,6 +683,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             }
         }
 
+        @Override
         public Result call() throws IOException {
             try {
                 return super.call();
@@ -771,6 +772,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             super(cause);
         }
 
+        @Override
         public Exception getCause() {
             return (Exception)super.getCause();
         }

test/src/test/java/hudson/tasks/BuildTriggerTest.java

@@ -25,9 +25,13 @@ package hudson.tasks;
 
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import hudson.maven.MavenModuleSet;
+import hudson.maven.MavenModuleSetBuild;
 import hudson.model.Build;
-import hudson.model.Project;
+import hudson.model.FreeStyleProject;
 import hudson.model.Result;
+import hudson.model.Run;
+import org.jvnet.hudson.test.ExtractResourceSCM;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.MockBuilder;
 
@@ -36,13 +40,9 @@ import org.jvnet.hudson.test.MockBuilder;
  * @author Alan.Harder@sun.com
  */
 public class BuildTriggerTest extends HudsonTestCase {
-    private void doTriggerTest(boolean evenWhenUnstable, Result triggerResult,
-            Result dontTriggerResult) throws Exception {
-        Project p = createFreeStyleProject(),
-                dp = createFreeStyleProject("downstream");
-        p.getPublishersList().add(new BuildTrigger("downstream", evenWhenUnstable));
-        p.getBuildersList().add(new MockBuilder(dontTriggerResult));
-        hudson.rebuildDependencyGraph();
+
+    private FreeStyleProject createDownstreamProject() throws Exception {
+        FreeStyleProject dp = createFreeStyleProject("downstream");
 
         // Hm, no setQuietPeriod, have to submit form..
         WebClient webClient = new WebClient();
@@ -53,17 +53,36 @@ public class BuildTriggerTest extends HudsonTestCase {
         submit(form);
         assertEquals("set quiet period", 0, dp.getQuietPeriod());
 
+        return dp;
+    }
+
+    private void doTriggerTest(boolean evenWhenUnstable, Result triggerResult,
+            Result dontTriggerResult) throws Exception {
+        FreeStyleProject p = createFreeStyleProject(),
+                dp = createDownstreamProject();
+        p.getPublishersList().add(new BuildTrigger("downstream", evenWhenUnstable));
+        p.getBuildersList().add(new MockBuilder(dontTriggerResult));
+        hudson.rebuildDependencyGraph();
+
         // First build should not trigger downstream job
-        Build b = (Build)p.scheduleBuild2(0).get();
+        Build b = p.scheduleBuild2(0).get();
+        assertNoDownstreamBuild(dp, b);
+
+        // Next build should trigger downstream job
+        p.getBuildersList().replace(new MockBuilder(triggerResult));
+        b = p.scheduleBuild2(0).get();
+        assertDownstreamBuild(dp, b);
+    }
+
+    private void assertNoDownstreamBuild(FreeStyleProject dp, Run b) throws Exception {
         for (int i = 0; i < 3; i++) {
             Thread.sleep(200);
             assertTrue("downstream build should not run!  upstream log: " + getLog(b),
                        !dp.isInQueue() && !dp.isBuilding() && dp.getLastBuild()==null);
         }
+    }
 
-        // Next build should trigger downstream job
-        p.getBuildersList().replace(new MockBuilder(triggerResult));
-        b = (Build)p.scheduleBuild2(0).get();
+    private void assertDownstreamBuild(FreeStyleProject dp, Run b) throws Exception {
         // Wait for downstream build
         for (int i = 0; dp.getLastBuild()==null && i < 20; i++) Thread.sleep(100);
         assertNotNull("downstream build didn't run.. upstream log: " + getLog(b), dp.getLastBuild());
@@ -76,4 +95,40 @@ public class BuildTriggerTest extends HudsonTestCase {
     public void testTriggerEvenWhenUnstable() throws Exception {
         doTriggerTest(true, Result.UNSTABLE, Result.FAILURE);
     }
+
+    private void doMavenTriggerTest(boolean evenWhenUnstable) throws Exception {
+        FreeStyleProject dp = createDownstreamProject();
+        configureDefaultMaven();
+        MavenModuleSet m = createMavenProject();
+        m.getPublishersList().add(new BuildTrigger("downstream", evenWhenUnstable));
+        if (!evenWhenUnstable) {
+            // Configure for UNSTABLE
+            m.setGoals("clean test");
+            m.setScm(new ExtractResourceSCM(getClass().getResource("maven-test-failure.zip")));
+        } // otherwise do nothing which gets FAILURE
+        // First build should not trigger downstream project
+        MavenModuleSetBuild b = m.scheduleBuild2(0).get();
+        assertNoDownstreamBuild(dp, b);
+
+        if (evenWhenUnstable) {
+            // Configure for UNSTABLE
+            m.setGoals("clean test");
+            m.setScm(new ExtractResourceSCM(getClass().getResource("maven-test-failure.zip")));
+        } else {
+            // Configure for SUCCESS
+            m.setGoals("clean");
+            m.setScm(new ExtractResourceSCM(getClass().getResource("maven-empty.zip")));
+        }
+        // Next build should trigger downstream project
+        b = m.scheduleBuild2(0).get();
+        assertDownstreamBuild(dp, b);
+    }
+
+    public void testMavenBuildTrigger() throws Exception {
+        doMavenTriggerTest(false);
+    }
+
+    public void testMavenTriggerEvenWhenUnstable() throws Exception {
+        doMavenTriggerTest(true);
+    }
 }