Merge pull request #57 from FrantaM/JENKINS-7739

[FIXED JENKINS-7739] Downstream projects not evaluated recursively
jenkinsci · Aug 17, 2015 · beefbbb · beefbbb
2 parents dd0612f + 4f9927d
commit beefbbb
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 11 deletions.
diff --git a/src/main/java/hudson/plugins/promoted_builds/conditions/DownstreamPassCondition.java b/src/main/java/hudson/plugins/promoted_builds/conditions/DownstreamPassCondition.java
@@ -9,6 +9,7 @@
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.AutoCompletionCandidates;
+import hudson.model.Cause;
 import hudson.model.Cause.UpstreamCause;
 import hudson.model.Fingerprint;
 import hudson.model.Fingerprint.BuildPtr;
@@ -37,6 +38,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.Stack;
 import org.kohsuke.stapler.export.Exported;
 
 /**
@@ -238,18 +240,24 @@ public void onCompleted(AbstractBuild<?,?> build, TaskListener listener) {
                                 AbstractBuild<?,?> u = build.getUpstreamRelationshipBuild(j);
                                 if (u==null) {
                                     // if the fingerprint doesn't tell us, perhaps the cause would tell us?
-                                    for (UpstreamCause uc : Util.filter(build.getCauses(), UpstreamCause.class)) {
-                                        if (uc.getUpstreamProject().equals(j.getFullName())) {
-                                            u = j.getBuildByNumber(uc.getUpstreamBuild());
-                                            if (u!=null) {
-                                                // remember that this build is a pseudo-downstream of the discovered build.
-                                                PseudoDownstreamBuilds pdb = u.getAction(PseudoDownstreamBuilds.class);
-                                                if (pdb==null)
-                                                    u.addAction(pdb=new PseudoDownstreamBuilds());
-                                                pdb.add(build);
-                                                u.save();
-                                                break;
+                                    final Stack<List<Cause>> stack = new Stack<List<Cause>>();
+                                    stack.push(build.getCauses());
+
+                                    while(!stack.isEmpty()) {
+                                        for (UpstreamCause uc : Util.filter(stack.pop(), UpstreamCause.class)) {
+                                            if (uc.getUpstreamProject().equals(j.getFullName())) {
+                                                u = j.getBuildByNumber(uc.getUpstreamBuild());
+                                                if (u!=null) {
+                                                    // remember that this build is a pseudo-downstream of the discovered build.
+                                                    PseudoDownstreamBuilds pdb = u.getAction(PseudoDownstreamBuilds.class);
+                                                    if (pdb==null)
+                                                        u.addAction(pdb=new PseudoDownstreamBuilds());
+                                                    pdb.add(build);
+                                                    u.save();
+                                                    break;
+                                                }
                                             }
+                                            stack.push(uc.getUpstreamCauses());
                                         }
                                     }
                                 }

diff --git a/src/test/java/hudson/plugins/promoted_builds/conditions/DownstreamPassConditionTest.java b/src/test/java/hudson/plugins/promoted_builds/conditions/DownstreamPassConditionTest.java
@@ -0,0 +1,80 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2015 Franta Mejta
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.plugins.promoted_builds.conditions;
+
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+import hudson.model.Result;
+import hudson.plugins.promoted_builds.JobPropertyImpl;
+import hudson.plugins.promoted_builds.PromotedBuildAction;
+import hudson.plugins.promoted_builds.PromotionProcess;
+import hudson.plugins.promoted_builds.Status;
+import hudson.tasks.BuildTrigger;
+
+public final class DownstreamPassConditionTest {
+
+    @Rule
+    public JenkinsRule j =  new JenkinsRule();
+
+    @Test
+    @Bug(7739)
+    public void shouldEvaluateUpstreamRecursively() throws Exception {
+        final FreeStyleProject job1 = j.createFreeStyleProject();
+        final FreeStyleProject job2 = j.createFreeStyleProject();
+        final FreeStyleProject job3 = j.createFreeStyleProject();
+
+        final JobPropertyImpl property = new JobPropertyImpl(job1);
+        job1.addProperty(property);
+
+        final PromotionProcess process = property.addProcess("promotion");
+        process.conditions.add(new DownstreamPassCondition(job3.getFullName()));
+
+        job1.getPublishersList().add(new BuildTrigger(job2.getFullName(), Result.SUCCESS));
+        job2.getPublishersList().add(new BuildTrigger(job3.getFullName(), Result.SUCCESS));
+
+        final FreeStyleBuild run1 = j.buildAndAssertSuccess(job1);
+        j.waitUntilNoActivity();
+        j.assertBuildStatusSuccess(job2.getLastBuild());
+        j.waitUntilNoActivity();
+        final FreeStyleBuild run3 = j.assertBuildStatusSuccess(job3.getLastBuild());
+        j.waitUntilNoActivity();
+
+        assertEquals("fingerprint relation", run3.getUpstreamRelationship(job1), -1);
+        assertFalse("no promotion process", process.getBuilds().isEmpty());
+
+        final PromotedBuildAction action = run1.getAction(PromotedBuildAction.class);
+        assertNotNull("no promoted action", action);
+
+        final Status promotion = action.getPromotion("promotion");
+        assertNotNull("promotion not found", promotion);
+        assertTrue("promotion not successful", promotion.isPromotionSuccessful());
+    }
+
+}