[FIXED JENKINS-14118] show builds triggered through "Conditional buil…

…dstep" plugin reported as downstream builds for the current build.
jenkinsci · Oct 11, 2012 · ad97504 · ad97504
1 parent 022995b
commit ad97504
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/conditionalbuildstep/ConditionalBuilder.java b/src/main/java/org/jenkinsci/plugins/conditionalbuildstep/ConditionalBuilder.java
@@ -27,8 +27,10 @@
 import hudson.Extension;
 import hudson.Launcher;
 import hudson.model.BuildListener;
+import hudson.model.DependencyGraph;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
+import hudson.model.DependecyDeclarer;
 import hudson.model.Descriptor;
 import hudson.model.Hudson;
 import hudson.tasks.BuildStep;
@@ -56,7 +58,7 @@
  * @author Dominik Bartholdi (imod)
  * @author Chris Johnson (cjo9900)
  */
-public class ConditionalBuilder extends Builder {
+public class ConditionalBuilder extends Builder implements DependecyDeclarer {
     private static Logger log = Logger.getLogger(ConditionalBuilder.class.getName());
 
     // retaining backward compatibility
@@ -166,4 +168,12 @@ public List<? extends Descriptor<? extends RunCondition>> getRunConditions() {
 
     }
 
+    public void buildDependencyGraph(AbstractProject project, DependencyGraph graph) {
+        for (Builder builder : conditionalbuilders) {
+            if(builder instanceof DependecyDeclarer) {
+                ((DependecyDeclarer)builder).buildDependencyGraph(project, graph);
+            }
+        }
+    }
+
 }
diff --git a/.../java/org/jenkinsci/plugins/conditionalbuildstep/singlestep/SingleConditionalBuilder.java b/.../java/org/jenkinsci/plugins/conditionalbuildstep/singlestep/SingleConditionalBuilder.java
@@ -30,6 +30,8 @@
 import hudson.model.BuildListener;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
+import hudson.model.DependecyDeclarer;
+import hudson.model.DependencyGraph;
 import hudson.model.Descriptor;
 import hudson.model.Hudson;
 import hudson.tasks.BuildStep;
@@ -58,7 +60,7 @@
  * @author Anthony Robinson
  * @author Dominik Bartholdi (imod)
  */
-public class SingleConditionalBuilder extends Builder {
+public class SingleConditionalBuilder extends Builder implements DependecyDeclarer {
 
     public static final String PROMOTION_JOB_TYPE = "hudson.plugins.promoted_builds.PromotionProcess";
 
@@ -103,6 +105,12 @@ public boolean prebuild(final AbstractBuild<?, ?> build, final BuildListener lis
     public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher, final BuildListener listener) throws InterruptedException, IOException {
         return runner.perform(condition, buildStep, build, launcher, listener);
     }
+
+    public void buildDependencyGraph(AbstractProject project, DependencyGraph graph) {
+        if(buildStep instanceof DependecyDeclarer) {
+            ((DependecyDeclarer)buildStep).buildDependencyGraph(project, graph);
+        }
+    }
 
     @Extension(ordinal = Integer.MAX_VALUE - 500)
     public static class SingleConditionalBuilderDescriptor extends BuildStepDescriptor<Builder> {