ASA-1689: ASoC Jenkins plugin's parameter wait is not working. Adding…

… the InQueue Status. Signed-off-by: Quan Tran quanzt@gmail.com. (#43)
jenkinsci · Oct 15, 2019 · 59c3cb7 · 59c3cb7
1 parent 3f7e2d7
commit 59c3cb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -77,7 +77,12 @@
 	<dependency>
 		<groupId>com.hcl</groupId>
 		<artifactId>appscan.sdk</artifactId>
-		<version>1.0.9</version>
+		<version>1.0.10</version>
+  	</dependency>
+  	<dependency>
+  	  	<groupId>org.apache.wink</groupId>
+  		<artifactId>wink-json4j</artifactId>
+  		<version>1.4</version>
   	</dependency>
   	<dependency>
   		<groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/com/ibm/appscan/jenkins/plugin/builders/AppScanBuildStep.java b/src/main/java/com/ibm/appscan/jenkins/plugin/builders/AppScanBuildStep.java
@@ -288,7 +288,7 @@ public IResultsProvider call() throws AbortException {
 		    			progress.setStatus(new Message(Message.INFO, Messages.analysis_running()));
 		    			String status = provider.getStatus();
 
-		    			while(status != null && status.equalsIgnoreCase(CoreConstants.RUNNING)) {
+		    			while(status != null && (status.equalsIgnoreCase(CoreConstants.INQUEUE) || status.equalsIgnoreCase(CoreConstants.RUNNING))) {
 		    				Thread.sleep(60000);
 		    				status = provider.getStatus();
 		    			}