Merge pull request #3 from fbelzunc/JENKINS-28632

[PARTIALLY FIXED JENKINS-28632] Integration with Workflow to trigger a Workflow Job
jenkinsci · Nov 29, 2015 · 24c9e56 · 24c9e56
2 parents 454a566 + 98ece8b
commit 24c9e56
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.509</version><!-- which version of Jenkins is this plugin built against? -->
+    <version>1.580.1</version><!-- minimun required version to work with Workflow -->
   </parent>
 
   <artifactId>deployment-notification</artifactId>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>promoted-builds</artifactId>
-      <version>2.7</version>
+      <version>2.15</version>
       <optional>true</optional>
     </dependency>
   </dependencies>

diff --git a/src/main/java/org/jenkinsci/plugins/deployment/DeploymentTrigger.java b/src/main/java/org/jenkinsci/plugins/deployment/DeploymentTrigger.java
@@ -1,9 +1,9 @@
 package org.jenkinsci.plugins.deployment;
 
 import hudson.Extension;
-import hudson.model.AbstractProject;
 import hudson.model.AutoCompletionCandidates;
 import hudson.model.BuildableItem;
+import hudson.model.CauseAction;
 import hudson.model.Fingerprint;
 import hudson.model.Fingerprint.RangeSet;
 import hudson.model.Item;
@@ -15,6 +15,7 @@
 import hudson.triggers.TriggerDescriptor;
 import jenkins.model.FingerprintFacet;
 import jenkins.model.Jenkins;
+import jenkins.model.ParameterizedJobMixIn;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
@@ -34,7 +35,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-public class DeploymentTrigger extends Trigger<AbstractProject> {
+public class DeploymentTrigger extends Trigger<Job> {
     private final String upstreamJob;
     private final Condition cond;
 
@@ -59,6 +60,13 @@ public void checkAndFire(DeploymentFacet facet) {
             if (upstream==null)
                 upstream = Jenkins.getInstance().getItem(upstreamJob, job, Job.class);
 
+            //TODO: Jenkins 1.621+ can avoid to implement an inner inline class in code directly calling ParameterizedJobMixIn.scheduleBuild2
+            ParameterizedJobMixIn parameterizedJobMixIn = new ParameterizedJobMixIn() {
+                @Override protected Job asJob() {
+                    return job;
+                }
+            };
+
             RangeSet r = cond.calcMatchingBuildNumberOf(upstream, facet);
             if (!r.isEmpty()) {
                 if (findTriggeredRecord(facet.getFingerprint()).add(this)) {
@@ -67,13 +75,13 @@ public void checkAndFire(DeploymentFacet facet) {
                         if (b!=null) {
                             // pass all the current parameters if we can
                             ParametersAction action = b.getAction(ParametersAction.class);
-                            job.scheduleBuild(job.getQuietPeriod(), new UpstreamDeploymentCause(b), action);
+                            parameterizedJobMixIn.scheduleBuild2(5, new CauseAction(new UpstreamDeploymentCause(b)), action);
                             return;
                         }
                     }
 
                     // didn't find any matching build, so just trigger it but without the cause to link to the upstream
-                    job.scheduleBuild();    // TODO: expose a version that takes name and build number
+                    parameterizedJobMixIn.scheduleBuild();    // TODO: expose a version that takes name and build number
                 }
             }
         } catch (IOException e) {
@@ -101,10 +109,13 @@ public static class ListenerImpl extends DeploymentFacetListener {
         public void onChange(final DeploymentFacet facet, HostRecord newRecord) {
             POOL.submit(new Runnable() {
                 public void run() {
-                    for (AbstractProject<?,?> p : Jenkins.getInstance().getAllItems(AbstractProject.class)) {
-                        DeploymentTrigger t = p.getTrigger(DeploymentTrigger.class);
-                        if (t!=null) {
-                            t.checkAndFire(facet);
+                    //TODO - 1.621: use getTrigger(Job<?,?> job, Class<T> clazz)
+                    for (ParameterizedJobMixIn.ParameterizedJob parameterizedJob : Jenkins.getInstance().getAllItems(ParameterizedJobMixIn.ParameterizedJob.class)) {
+                        for (Trigger trigger : parameterizedJob.getTriggers().values()) {
+                            if (trigger instanceof DeploymentTrigger) {
+                                DeploymentTrigger deploymentTrigger = (DeploymentTrigger) trigger;
+                                deploymentTrigger.checkAndFire(facet);
+                            }
                         }
                     }
                 }