Adjust relative paths for CSIT files

Remove leading test/csit/ from all relative paths to
accomodate the move into integration/csit repo.

Change-Id: Id9482b46df839f5eba28135e9f987a3eda1d7d94
Issue-ID: INT-671
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/plans/music/music-distributed-kv-store-test-plan/testplan.txt b/plans/music/music-distributed-kv-store-test-plan/testplan.txt
index ac37bc5a..654f0785 100644
--- a/plans/music/music-distributed-kv-store-test-plan/testplan.txt
+++ b/plans/music/music-distributed-kv-store-test-plan/testplan.txt
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 music/music-distributed-kv-store-suite
\ No newline at end of file
diff --git a/plans/music/music-test-plan/setup.sh b/plans/music/music-test-plan/setup.sh
index 7775bc52..f8d950e4 100755
--- a/plans/music/music-test-plan/setup.sh
+++ b/plans/music/music-test-plan/setup.sh
@@ -19,7 +19,7 @@
 # add here eventual scripts needed for music
 #
 echo "########## music scripts calling ##########";
-source ${WORKSPACE}/test/csit/scripts/music/music-scripts/music_script.sh
+source ${WORKSPACE}/scripts/music/music-scripts/music_script.sh
 
 #
 # add here all the configuration steps eventually needed to be carried out for music CSIT testing
@@ -35,10 +35,10 @@ TT=10
 WORK_DIR=/tmp/music
 CASS_USERNAME=nelson24
 CASS_PASSWORD=winman123
-MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/test/csit/scripts/music/music-properties
+MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/scripts/music/music-properties
 MUSIC_PROPERTIES=/tmp/music/properties
 MUSIC_LOGS=/tmp/music/logs
-CQL_FILES=${WORKSPACE}/test/csit/scripts/music/cql
+CQL_FILES=${WORKSPACE}/scripts/music/cql
 MUSIC_TRIGGER_DIR=/tmp/triggers
 TRIGGER_JAR=musictrigger-0.1.0.jar
 TRIGGER_JAR_URL=https://nexus.onap.org/service/local/repositories/autorelease-72298/content/org/onap/music/musictrigger/0.1.0/musictrigger-0.1.0.jar
@@ -70,7 +70,7 @@ ${CASS_IMG};
 
 CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db`
 echo "CASSANDRA_IP=${CASSA_IP}"
-${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
 
 # See if cassandra is up.
 echo "########## Running Test to see if Cassandra is up ##########"
@@ -122,7 +122,7 @@ docker network connect bridge music-tomcat;
 TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
 echo "TOMCAT_IP=${TOMCAT_IP}"
 
-${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
+${WORKSPACE}/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
 
 sleep 20;
 echo "########## TOMCAT Logs ##########"
diff --git a/plans/music/music-test-plan/testplan.txt b/plans/music/music-test-plan/testplan.txt
index e53f3267..0f9298ef 100644
--- a/plans/music/music-test-plan/testplan.txt
+++ b/plans/music/music-test-plan/testplan.txt
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 music/music-suite