Merge pull request #4532 from Microsoft/users/jpricket/jenkins

Fixing bug where JenkinsQueueJob task waits
microsoft · Jun 13, 2017 · 030c1b9 · 030c1b9
2 parents 4bdbf05 + c43897e
commit 030c1b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Tasks/JenkinsQueueJob/job.ts b/Tasks/JenkinsQueueJob/job.ts
@@ -167,6 +167,12 @@ export class Job {
     }
 
     setStreaming(executableNumber: number): void {
+        // If we aren't waiting for the job to finish then we should end it now
+        if (!this.queue.taskOptions.captureConsole) { // transition to Finishing
+            this.changeState(JobState.Streaming);
+            this.changeState(JobState.Finishing);
+            return;
+        }
         if (this.state == JobState.New || this.state == JobState.Locating) {
             this.executableNumber = executableNumber;
             this.executableUrl = Util.addUrlSegment(this.taskUrl, this.executableNumber.toString());

diff --git a/Tasks/JenkinsQueueJob/task.json b/Tasks/JenkinsQueueJob/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 1,
         "Minor": 119,
-        "Patch": 0
+        "Patch": 2
     },
     "groups": [
         {

diff --git a/Tasks/JenkinsQueueJob/task.loc.json b/Tasks/JenkinsQueueJob/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 1,
     "Minor": 119,
-    "Patch": 0
+    "Patch": 2
   },
   "groups": [
     {