aboutsummaryrefslogtreecommitdiffstats
path: root/cmso-sonar/docker/integration
diff options
context:
space:
mode:
Diffstat (limited to 'cmso-sonar/docker/integration')
-rw-r--r--cmso-sonar/docker/integration/cmso-ticketmgt/etc/startJacocoService.sh2
-rw-r--r--cmso-sonar/docker/integration/cmso-topology/etc/startJacocoService.sh2
-rw-r--r--cmso-sonar/docker/integration/docker-compose.yml2
-rwxr-xr-xcmso-sonar/docker/integration/ete_test.sh13
4 files changed, 15 insertions, 4 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