[JENKINS-8985] BuildTrigger modification to handle DependencyGroups.

Pull individual Dependencys out of DependencyGroups we see in BuildTrigger.execute and make sure to actually kick those builds off as well, so that we can have two different dependencies (say, for different parameters) from one upstream project to a single downstream project.
jenkinsci · May 20, 2011 · 78c709e · 78c709e · wolfs · May 21, 2011
1 parent 1e9720d
commit 78c709e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/changelog.html b/changelog.html
@@ -63,6 +63,9 @@
   <li class=bug>
     Fix unescaped apostrophe in French translation.
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9699">issue 9699</a>)
+  <li class=bug>
+    Allow building multiple downstream dependencies on a single job via DependencyGraph and BuildTrigger.
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-8985">issue 8985</a>)
   <li class=rfe>
     Set NODE_NAME for master node to "master"
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-9671">issue 9671</a>)

diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java
@@ -478,18 +478,22 @@ public int hashCode() {
     /**
      * Collect multiple dependencies between the same two projects.
      */
-    private static class DependencyGroup extends Dependency {
+    public static class DependencyGroup extends Dependency {
         private Set<Dependency> group = new LinkedHashSet<Dependency>();
 
         DependencyGroup(Dependency first) {
             super(first.getUpstreamProject(), first.getDownstreamProject());
             group.add(first);
         }
 
-        void add(Dependency next) {
+        private void add(Dependency next) {
             group.add(next);
         }
 
+        public Set<Dependency> getGroup() {
+            return group;
+        }
+
         @Override
         public boolean shouldTriggerBuild(AbstractBuild build, TaskListener listener,
                                           List<Action> actions) {

diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java
@@ -201,7 +201,19 @@ public int compare(Dependency lhs, Dependency rhs) {
             }
         });
 
+        List<Dependency> depsToBuild = new ArrayList<Dependency>();
         for (Dependency dep : downstreamProjects) {
+            if (dep instanceof DependencyGraph.DependencyGroup) {
+                for (Dependency d : ((DependencyGraph.DependencyGroup)dep).getGroup()) {
+                    depsToBuild.add(d);
+                }
+            }
+            else {
+                depsToBuild.add(dep);
+            }
+        }
+
+        for (Dependency dep : depsToBuild) {
             AbstractProject p = dep.getDownstreamProject();
             if (p.isDisabled()) {
                 logger.println(Messages.BuildTrigger_Disabled(p.getName()));