[FIXED JENKINS-18931] Build is triggered incorrectly when a triggered…

… build starts running. Context should be calculated against a completed build not an in progress one.
jenkinsci · Jul 25, 2013 · 6aac32a · 6aac32a
1 parent 12f65d7
commit 6aac32a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/buildresulttrigger/BuildResultTrigger.java b/src/main/java/org/jenkinsci/plugins/buildresulttrigger/BuildResultTrigger.java
@@ -101,7 +101,7 @@ protected BuildResultTriggerContext getContext(Node node, XTriggerLog log) throw
                 for (String jobName : info.getJobNamesAsArray()) {
                     AbstractProject job = Hudson.getInstance().getItemByFullName(jobName, AbstractProject.class);
                     if (isValidBuildResultProject(job)) {
-                        Run lastBuild = job.getLastBuild();
+                        Run lastBuild = job.getLastCompletedBuild();
                         if (lastBuild != null) {
                             int buildNumber = lastBuild.getNumber();
                             if (buildNumber != 0) {
@@ -200,7 +200,7 @@ private boolean isMatchingExpectedResults(String jobName, CheckedResult[] expect
         }
 
         AbstractProject jobObj = Hudson.getInstance().getItemByFullName(jobName, AbstractProject.class);
-        Run jobObjLastBuild = jobObj.getLastBuild();
+        Run jobObjLastBuild = jobObj.getLastCompletedBuild()();
         Result jobObjectLastResult = jobObjLastBuild.getResult();
 
         for (CheckedResult checkedResult : expectedResults) {