From: Jerry Flood <jflood@att.com>
Date: Thu, 18 Apr 2019 22:10:57 +0000 (-0400)
Subject: Updated CSIT to reference new repo location
X-Git-Tag: 4.0.0-ONAP~29^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=integration%2Fcsit.git;a=commitdiff_plain;h=e0eb9cec346556650ca53cb6732478d7a797d535

Updated CSIT to reference new repo location

Relocated the CSIT tests to support Sonar Job.

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

diff --git a/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh b/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh
index 3b2de744..be12bfdc 100644
--- a/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh
+++ b/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh
@@ -28,7 +28,7 @@ echo "This is ${WORKSPACE}/scripts/cmso/clone_cmso_and_change_dockercompose.sh"
 mkdir -p /tmp/$WORKSPACE/archives/cmso-clone
 cd /tmp/$WORKSPACE/archives/cmso-clone
 git clone --depth 1 https://gerrit.onap.org/r/optf/cmso -b master
-cd cmso/cmso-robot/docker/cmso-service
+cd cmso/cmso-sonar/docker/integration
 
 sed -i '/image: onap\/optf-cmso-service/c\    image: nexus3.onap.org:10001\/onap\/optf-cmso-service:latest' docker-compose.yml
 sed -i '/image: onap\/optf-cmso-dbinit/c\    image: nexus3.onap.org:10001\/onap\/optf-cmso-dbinit:latest' docker-compose.yml
@@ -50,9 +50,9 @@ cat up.txt
 echo =======================
 
 ### Wait for robot to finish
-docker exec cmsoservice_cmso-robot_1 ls
+docker exec integration_cmso-robot_1 ls
 while [ $? -ne 1 ]; do
   sleep 120
-  docker exec cmsoservice_cmso-robot_1 ls
+  docker exec integration_cmso-robot_1 ls
 done
 
diff --git a/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh b/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh
index 5d8c0597..6b121ad7 100644
--- a/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh
+++ b/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh
@@ -20,7 +20,7 @@
 
 echo "This is ${WORKSPACE}/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh"
 cd /tmp/$WORKSPACE/archives/cmso-clone
-cd cmso/cmso-robot/docker/cmso-service
+cd cmso/cmso-sonar/docker/integration
 docker-compose down
 
 cp -f ./cmso-robot/logs/output.xml $WORKSPACE/archives