diff options
Diffstat (limited to 'cmso-robot/docker')
| -rw-r--r-- | cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh | 2 | ||||
| -rwxr-xr-x | cmso-robot/docker/cmso-service/ete_test.sh | 21 |
2 files changed, 16 insertions, 7 deletions
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh b/cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh index 0db6f1f..5d65a7f 100644 --- a/cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh +++ b/cmso-robot/docker/cmso-service/cmso-service/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/service.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*" echo "VM_ARGS=${VM_ARGS}" diff --git a/cmso-robot/docker/cmso-service/ete_test.sh b/cmso-robot/docker/cmso-service/ete_test.sh index cd77ba5..0d86fef 100755 --- a/cmso-robot/docker/cmso-service/ete_test.sh +++ b/cmso-robot/docker/cmso-service/ete_test.sh @@ -2,24 +2,33 @@ docker-compose up >up.txt 2>&1 & ### Wait for robot to finish -sleep 60 -docker exec -it cmso-service_cmso-robot_1 ls +sleep 240 +docker exec cmso-service_cmso-robot_1 ls while [ $? -ne 1 ]; do sleep 60 - docker exec -it cmso-service_cmso-robot_1 ls + docker exec cmso-service_cmso-robot_1 ls done ### Shut down java with to give time to write the jacoco_exec file docker exec cmso-service_cmso-service_1 pkill java +docker exec cmso-service_cmso-optimizer_1 pkill java sleep 10 -### wait for cmso-service container to exit -docker exec -it cmso-service_cmso-service_1 ls +### wait for cmso containers to exit and jacoco files written +docker exec cmso-service_cmso-service_1 ls while [ $? -ne 1 ]; do sleep 60 - docker exec -it cmso-service_cmso-service_1 ls + docker exec cmso-service_cmso-service_1 ls done +docker exec cmso-service_cmso-optimizer_1 ls +while [ $? -ne 1 ]; do + sleep 60 + docker exec cmso-service_cmso-optimizer_1 ls +done + +cat up.txt + docker ps -a docker-compose down docker ps -a |