Attempt to fix the verify job problem

Remove the parallel execution of the Integration tests

Issue-ID: CLAMP-899
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ia4d60941821f1e5363d5ba5e734a0d9a5ec9186d

diff --git a/pom.xml b/pom.xml
index 245bae0..6eb411a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -914,8 +914,8 @@
                                                        <includes>
                                                                <include>**/*ItCase.java</include>
                                                        </includes>
-                                                       <forkCount>1C</forkCount>
-                                                       <reuseForks>false</reuseForks>
+                                                       <forkCount>1</forkCount>
+                                                       <reuseForks>true</reuseForks>
                                                        <useSystemClassLoader>false</useSystemClassLoader>
                                                        <argLine>${failsafeArgLine}</argLine>
                                                </configuration>

diff --git a/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java b/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
index 510e327..90a2401 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/HttpsItCase.java
@@ -29,14 +29,12 @@ import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.nio.charset.Charset;
-
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -47,6 +45,7 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
@@ -57,6 +56,7 @@ import org.springframework.web.client.RestTemplate;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
 @TestPropertySource(locations = "classpath:https/https-test.properties")
+@DirtiesContext
 public class HttpsItCase {
 
     @Value("${server.port}")

diff --git a/src/test/java/org/onap/clamp/clds/it/RobotItCase.java b/src/test/java/org/onap/clamp/clds/it/RobotItCase.java
index b386d9b..5eff96e 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/it/RobotItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/RobotItCase.java
@@ -45,12 +45,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @TestPropertySource(locations = "classpath:robotframework/robotframework-test.properties")
+@DirtiesContext
 public class RobotItCase {
 
     @Value("${server.port}")