Merge "Add robot integration test"

1 files changed, 13 insertions, 5 deletions

diff --git a/cmso-robot/docker/cmso-service/ete_test.sh b/cmso-robot/docker/cmso-service/ete_test.sh
index cd77ba5..fce07eb 100755
--- a/cmso-robot/docker/cmso-service/ete_test.sh
+++ b/cmso-robot/docker/cmso-service/ete_test.sh
@@ -3,23 +3,31 @@ docker-compose up >up.txt 2>&1 &
 
 ### Wait for robot to finish
 sleep 60
-docker exec -it cmso-service_cmso-robot_1 ls
+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
+
+
 docker ps -a
 docker-compose down
 docker ps -a