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>

8 files changed, 18 insertions, 18 deletions

diff --git a/plans/dmaap-buscontroller/mock_downstream/setup.sh b/plans/dmaap-buscontroller/mock_downstream/setup.sh
index d5c77b0b..9f5dbbc6 100755
--- a/plans/dmaap-buscontroller/mock_downstream/setup.sh
+++ b/plans/dmaap-buscontroller/mock_downstream/setup.sh
@@ -22,7 +22,7 @@
 
 
 # Place the scripts in run order:
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
 start_mock "aaf" 
 AAF_IP=${IP}
 start_mock "mrc" 3904
@@ -30,7 +30,7 @@ MRC_IP=${IP}
 start_mock "drps" 
 DRPS_IP=${IP}
 
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
 dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
 DMAAPBC_IP=${IP}
 
@@ -41,5 +41,5 @@ echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
 ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
 
 set -x
-${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
+${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
 set +x
diff --git a/plans/dmaap-buscontroller/mock_downstream/testplan.txt b/plans/dmaap-buscontroller/mock_downstream/testplan.txt
index 39a2f449..484fb295 100644
--- a/plans/dmaap-buscontroller/mock_downstream/testplan.txt
+++ b/plans/dmaap-buscontroller/mock_downstream/testplan.txt
@@ -1,4 +1,4 @@
-# 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.
 dmaap-buscontroller/suite1
 
diff --git a/plans/dmaap-buscontroller/ssl/setup.sh b/plans/dmaap-buscontroller/ssl/setup.sh
index e40f62de..6ab50ed1 100755
--- a/plans/dmaap-buscontroller/ssl/setup.sh
+++ b/plans/dmaap-buscontroller/ssl/setup.sh
@@ -22,7 +22,7 @@
 
 
 # Place the scripts in run order:
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
 start_mock "aaf" 
 AAF_IP=${IP}
 start_mock "mrc" 3905
@@ -30,7 +30,7 @@ MRC_IP=${IP}
 start_mock "drps" 8443
 DRPS_IP=${IP}
 
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
 dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
 DMAAPBC_IP=${IP}
 
@@ -41,5 +41,5 @@ echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
 ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
 
 set -x
-${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
+${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
 set +x
diff --git a/plans/dmaap-buscontroller/ssl/testplan.txt b/plans/dmaap-buscontroller/ssl/testplan.txt
index e106e7b6..54ce4df1 100644
--- a/plans/dmaap-buscontroller/ssl/testplan.txt
+++ b/plans/dmaap-buscontroller/ssl/testplan.txt
@@ -1,4 +1,4 @@
-# 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.
 dmaap-buscontroller/ssl_suite
 
diff --git a/plans/dmaap-buscontroller/with_dr/setup.sh b/plans/dmaap-buscontroller/with_dr/setup.sh
index 7cefa727..d9d8574f 100755
--- a/plans/dmaap-buscontroller/with_dr/setup.sh
+++ b/plans/dmaap-buscontroller/with_dr/setup.sh
@@ -29,11 +29,11 @@ then
 else
 
 	# Place the scripts in run order:
-	source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dr-launch.sh
+	source ${WORKSPACE}/scripts/dmaap-buscontroller/dr-launch.sh
 	dmaap_dr_launch
 	DRPS_IP=${IP}
 
-	#source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+	#source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
 	#start_mock "aaf" 
 	#AAF_IP=${IP}
 	AAF_IP=0.0.0.0
@@ -41,7 +41,7 @@ else
 	#DRPS_IP=${IP}
 	MRC_IP=0.0.0.0
 
-	source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+	source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
 	dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
 	DMAAPBC_IP=${IP}
 
@@ -51,7 +51,7 @@ else
 	# Pass any variables required by Robot test suites in ROBOT_VARIABLES
 	ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
 	set -x
-	${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
+	${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
 	set +x
 fi
 
diff --git a/plans/dmaap-buscontroller/with_mr/setup.sh b/plans/dmaap-buscontroller/with_mr/setup.sh
index bcd19b5a..01636867 100755
--- a/plans/dmaap-buscontroller/with_mr/setup.sh
+++ b/plans/dmaap-buscontroller/with_mr/setup.sh
@@ -26,11 +26,11 @@ then
 else
 
 	# Place the scripts in run order:
-	source ${WORKSPACE}/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh
+	source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh
 	dmaap_mr_launch
 	MRC_IP=${IP}
 
-	source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+	source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
 	start_mock "aaf" 
 	AAF_IP=${IP}
 	#AAF_IP=0.0.0.0
@@ -38,7 +38,7 @@ else
 	#DRPS_IP=${IP}
 	DRPS_IP=0.0.0.0
 
-	source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+	source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
 	dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
 	DMAAPBC_IP=${IP}
 
@@ -48,7 +48,7 @@ else
 	# Pass any variables required by Robot test suites in ROBOT_VARIABLES
 	ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
 	set -x
-	${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
+	${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
 	set +x
 fi
 
diff --git a/plans/dmaap-buscontroller/with_mr/teardown.sh b/plans/dmaap-buscontroller/with_mr/teardown.sh
index 3feebe07..ae064814 100644
--- a/plans/dmaap-buscontroller/with_mr/teardown.sh
+++ b/plans/dmaap-buscontroller/with_mr/teardown.sh
@@ -19,7 +19,7 @@
 # ============LICENSE_END=========================================================
 # 
 #
-source ${WORKSPACE}/test/csit/scripts/dmaap-message-router/dmaap-mr-teardown.sh
+source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-teardown.sh
 
 if [ "$KEEP_DMAAP" != "Y" ]
 then
diff --git a/plans/dmaap-buscontroller/with_mr/testplan.txt b/plans/dmaap-buscontroller/with_mr/testplan.txt
index 4f4ff717..0728bd44 100644
--- a/plans/dmaap-buscontroller/with_mr/testplan.txt
+++ b/plans/dmaap-buscontroller/with_mr/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.
 dmaap-buscontroller/single-mr-suite