Include ticket/topology jacoco

Include optimizer validation test cases

Issue-ID: OPTFRA-474
Change-Id: I1ddd40b7148703a38b0840afd58f3fb667f2bf00
Signed-off-by: Jerry Flood <jflood@att.com>

5 files changed, 16 insertions, 5 deletions

diff --git a/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
index 0db6f1f..ef087fe 100644
--- a/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh
@@ -7,7 +7,7 @@ unzip org.jacoco.agent-0.8.2.jar
 cp org.jacoco.agent-0.8.2/jacocoagent.jar .
 ls -l
 
-VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.optf.cmso.*"
+VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/ticketmgt.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
 
 echo "VM_ARGS=${VM_ARGS}"
 
diff --git a/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh b/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
index 0db6f1f..0717d68 100644
--- a/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
+++ b/cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh
@@ -7,7 +7,7 @@ unzip org.jacoco.agent-0.8.2.jar
 cp org.jacoco.agent-0.8.2/jacocoagent.jar .
 ls -l
 
-VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.optf.cmso.*"
+VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/topology.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
 
 echo "VM_ARGS=${VM_ARGS}"
 
diff --git a/cmso-sonar/docker/integration/docker-compose.yml b/cmso-sonar/docker/integration/docker-compose.yml
index e0c81f9..ce5a826 100644
--- a/cmso-sonar/docker/integration/docker-compose.yml
+++ b/cmso-sonar/docker/integration/docker-compose.yml
@@ -101,7 +101,7 @@ services:
       - GLOBAL_SCHEDULER_URL=http://cmso-service:8080
       - GLOBAL_OPTIMIZER_URL=http://cmso-optimizer:7997
       - CMSO_STARTUP_WAIT_TIME=20m
-      - TAGS=-i ete
+      - TAGS=-i ete -i opt_validation
       - OUTPUT=-d /share
     working_dir: /opt/cmso-robot  
     entrypoint: "bash -x /opt/cmso-robot/ete.sh"
diff --git a/cmso-sonar/docker/integration/ete_test.sh b/cmso-sonar/docker/integration/ete_test.sh
index 5c38fa2..aff605e 100755
--- a/cmso-sonar/docker/integration/ete_test.sh
+++ b/cmso-sonar/docker/integration/ete_test.sh
@@ -12,6 +12,8 @@ done
 ### Shut down java with to give time to write the jacoco_exec file
 docker exec integration_cmso-service_1 pkill java
 docker exec integration_cmso-optimizer_1 pkill java
+docker exec integration_cmso-ticketmgt_1 pkill java
+docker exec integration_cmso-topology_1 pkill java
 sleep 10
 
 ### wait for  cmso  containers to exit and jacoco files written
@@ -20,12 +22,21 @@ while [ $? -ne 1 ]; do
   sleep 60
   docker exec integration_cmso-service_1 ls
 done
-
 docker exec integration_cmso-optimizer_1 ls
 while [ $? -ne 1 ]; do
   sleep 60
   docker exec integration_cmso-optimizer_1 ls
 done
+docker exec integration_cmso-ticketmgt_1 ls
+while [ $? -ne 1 ]; do
+  sleep 60
+  docker exec integration_cmso-ticketmgt_1 ls
+done
+docker exec integration_cmso-topology_1 ls
+while [ $? -ne 1 ]; do
+  sleep 60
+  docker exec integration_cmso-topology_1 ls
+done
 
 cat up.txt
 
diff --git a/cmso-sonar/src/test/resources/integration.properties b/cmso-sonar/src/test/resources/integration.properties
index 48957a0..4e0e21b 100644
--- a/cmso-sonar/src/test/resources/integration.properties
+++ b/cmso-sonar/src/test/resources/integration.properties
@@ -4,4 +4,4 @@ jacoco.exec.classes=target/classes
 source.classes.folders=service|../cmso-service/target/classes,optimizer|../cmso-optimizer/target/classes
 jacoco.exec.source.files=docker/integration/cmso-service/logs/service.jacoco.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec
 
-copy.jacoco.for.sonar=docker/integration/cmso-service/logs/service.jacoco.exec|../cmso-service/target/jacoco-it.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec|../cmso-optimizer/target/jacoco-it.exec
\ No newline at end of file
+copy.jacoco.for.sonar=docker/integration/cmso-service/logs/service.jacoco.exec|../cmso-service/target/jacoco-it.exec,docker/integration/cmso-optimizer/logs/optimizer.jacoco.exec|../cmso-optimizer/target/jacoco-it.exec,docker/integration/cmso-topology/logs/topology.jacoco.exec|../cmso-topology/target/jacoco-it.exec,docker/integration/cmso-ticketmgt/logs/ticketmgt.jacoco.exec|../cmso-ticketmgt/target/jacoco-it.exec
\ No newline at end of file