Rename classes to avoid duplicates

Copy jacoco exec files for upload to sonar

Handle ending midnight in time window

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

1 files changed, 8 insertions, 8 deletions

diff --git a/cmso-sonar/docker/integration/ete_test.sh b/cmso-sonar/docker/integration/ete_test.sh
index 0d86fef..5c38fa2 100755
--- a/cmso-sonar/docker/integration/ete_test.sh
+++ b/cmso-sonar/docker/integration/ete_test.sh
@@ -3,28 +3,28 @@ docker-compose up >up.txt 2>&1 &
 
 ### Wait for robot to finish
 sleep 240
-docker exec cmso-service_cmso-robot_1 ls
+docker exec integration_cmso-robot_1 ls
 while [ $? -ne 1 ]; do
   sleep 60
-  docker exec cmso-service_cmso-robot_1 ls
+  docker exec integration_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
+docker exec integration_cmso-service_1 pkill java
+docker exec integration_cmso-optimizer_1 pkill java
 sleep 10
 
 ### wait for  cmso  containers to exit and jacoco files written
-docker exec cmso-service_cmso-service_1 ls
+docker exec integration_cmso-service_1 ls
 while [ $? -ne 1 ]; do
   sleep 60
-  docker exec cmso-service_cmso-service_1 ls
+  docker exec integration_cmso-service_1 ls
 done
 
-docker exec cmso-service_cmso-optimizer_1 ls
+docker exec integration_cmso-optimizer_1 ls
 while [ $? -ne 1 ]; do
   sleep 60
-  docker exec cmso-service_cmso-optimizer_1 ls
+  docker exec integration_cmso-optimizer_1 ls
 done
 
 cat up.txt