Merge pull request jenkinsci#18 from quidryan/parentofparent

jglick · jglick · commit b6fda7c0728d · 2013-03-08T14:30:27.000-08:00
Clone of spark404's Parent of Parent fix
diff --git a/src/main/java/hudson/plugins/copyartifact/TriggeredBuildSelector.java b/src/main/java/hudson/plugins/copyartifact/TriggeredBuildSelector.java
@@ -23,6 +23,7 @@
  */
 package hudson.plugins.copyartifact;
 
+import jenkins.model.Jenkins;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.matrix.MatrixConfiguration;
@@ -59,10 +60,24 @@ public Run<?,?> getBuild(Job<?,?> job, EnvVars env, BuildFilter filter, Run<?,?>
         // Matrix run is triggered by its parent project, so check causes of parent build:
         for (Cause cause : parent instanceof MatrixRun
                 ? ((MatrixRun)parent).getParentBuild().getCauses() : parent.getCauses()) {
-            if (cause instanceof UpstreamCause
-                    && jobName.equals(((UpstreamCause)cause).getUpstreamProject())) {
-                Run<?,?> run = job.getBuildByNumber(((UpstreamCause)cause).getUpstreamBuild());
-                return (run != null && filter.isSelectable(run, env)) ? run : null;
+            if (cause instanceof UpstreamCause) {
+                UpstreamCause upstream = (UpstreamCause) cause;
+                if (jobName.equals(upstream.getUpstreamProject())) {
+                    Run<?,?> run = job.getBuildByNumber(upstream.getUpstreamBuild());
+                    return (run != null && filter.isSelectable(run, env)) ? run : null;
+                } else {
+                    // Figure out the parent job and do a recursive call to getBuild
+                    String parentJobName = upstream.getUpstreamProject();
+                    Job <?,?> parentJob = Jenkins.getInstance().getItemByFullName(parentJobName, Job.class);
+                    Run<?,?> run = getBuild(
+                        job,
+                        env,
+                        filter,
+                        parentJob.getBuildByNumber(upstream.getUpstreamBuild()));
+                    if (run != null && filter.isSelectable(run, env)) {
+                        return run;
+                    }
+                }
             }
         }
         if (isFallbackToLastSuccessful()) {
diff --git a/src/test/java/hudson/plugins/copyartifact/CopyArtifactTest.java b/src/test/java/hudson/plugins/copyartifact/CopyArtifactTest.java
@@ -527,6 +527,45 @@ public void testTriggeredBuildSelector() throws Exception {
         assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0, new UserCause()).get());
     }
 
+    public void testTriggeredBuildSelectorWithParentOfParent() throws Exception {
+        FreeStyleProject grandparent = createArtifactProject(),
+                         parent = createFreeStyleProject(),
+                         p = createFreeStyleProject();
+        p.getBuildersList().add(new CopyArtifact(grandparent.getName(), null, 
+                                    new TriggeredBuildSelector(false), "*.txt", "", false, false));
+        parent.getPublishersList().add(new BuildTrigger(p.getFullName(), false));
+        grandparent.getPublishersList().add(new BuildTrigger(parent.getFullName(), false));
+        hudson.rebuildDependencyGraph();
+        assertBuildStatusSuccess(grandparent.scheduleBuild2(0, new UserCause()));
+        // parent#1 was triggered
+        FreeStyleBuild b = parent.getBuildByNumber(1);
+        for (int i = 0; b == null && i < 2000; i++) { Thread.sleep(10); b = p.getBuildByNumber(1); }
+        assertNotNull(b);
+        while (b.isBuilding()) Thread.sleep(10);
+        assertBuildStatusSuccess(b);
+        // p#1 was triggered, now building.
+        b = p.getBuildByNumber(1);
+        for (int i = 0; b == null && i < 2000; i++) { Thread.sleep(10); b = p.getBuildByNumber(1); }
+        assertNotNull(b);
+        while (b.isBuilding()) Thread.sleep(10);
+        assertBuildStatusSuccess(b);
+        assertFile(true, "foo.txt", b);
+        assertFile(false, "subdir/subfoo.txt", b);
+        // Verify error if build not triggered by upstream job:
+        assertBuildStatus(Result.FAILURE, p.scheduleBuild2(0, new UserCause()).get());
+        // test fallback
+        
+        //run a failing build to make sure the fallback selects the last successful build
+        grandparent.getPublishersList().clear();
+        grandparent.getBuildersList().add(new FailureBuilder());
+        assertBuildStatus(Result.FAILURE, grandparent.scheduleBuild2(0, new UserCause()).get());
+        
+        p.getBuildersList().remove(CopyArtifact.class);
+        p.getBuildersList().add(new CopyArtifact(grandparent.getName(), null,
+                new TriggeredBuildSelector(true), "*.txt", "", false, false));
+        assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0, new UserCause()).get());
+    }
+
     /**
      * When copying from a particular matrix configuration, the upstream project
      * is the matrix parent.
