diff options
Diffstat (limited to 'plans')
103 files changed, 139 insertions, 139 deletions
diff --git a/plans/aaf/sms-test-plan/testplan.txt b/plans/aaf/sms-test-plan/testplan.txt index c2b3b7b1..3ac14bd1 100644 --- a/plans/aaf/sms-test-plan/testplan.txt +++ b/plans/aaf/sms-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. aaf/aaf-sms-suite
\ No newline at end of file diff --git a/plans/aai/esr-server/testplan.txt b/plans/aai/esr-server/testplan.txt index 43ed23e9..0592a70e 100644 --- a/plans/aai/esr-server/testplan.txt +++ b/plans/aai/esr-server/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. aai/esr-server/startup diff --git a/plans/aai/resources/testplan.txt b/plans/aai/resources/testplan.txt index 1e8902a5..e0538c03 100644 --- a/plans/aai/resources/testplan.txt +++ b/plans/aai/resources/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. aai/resources/api_suite aai/resources/relationship_suite diff --git a/plans/aai/search-data-service/testplan.txt b/plans/aai/search-data-service/testplan.txt index b0a72a0f..02f3ea37 100644 --- a/plans/aai/search-data-service/testplan.txt +++ b/plans/aai/search-data-service/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. aai/search-data-service/suite1 diff --git a/plans/aai/traversal/testplan.txt b/plans/aai/traversal/testplan.txt index 9b48bf9b..65603fd5 100644 --- a/plans/aai/traversal/testplan.txt +++ b/plans/aai/traversal/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. aai/traversal/suite1 diff --git a/plans/appc/healthcheck/setup.sh b/plans/appc/healthcheck/setup.sh index da441ea5..0ea9f925 100755 --- a/plans/appc/healthcheck/setup.sh +++ b/plans/appc/healthcheck/setup.sh @@ -18,7 +18,7 @@ # # Place the scripts in run order: SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source ${WORKSPACE}/test/csit/scripts/appc/script1.sh +source ${WORKSPACE}/scripts/appc/script1.sh export APPC_DOCKER_IMAGE_VERSION=1.4.0-SNAPSHOT-latest export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest diff --git a/plans/appc/healthcheck/testplan.txt b/plans/appc/healthcheck/testplan.txt index 97d82786..c7920561 100644 --- a/plans/appc/healthcheck/testplan.txt +++ b/plans/appc/healthcheck/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. appc/healthcheck appc/cdt diff --git a/plans/ccsdk/healthcheck/setup.sh b/plans/ccsdk/healthcheck/setup.sh index bdb5b550..c073acd6 100644 --- a/plans/ccsdk/healthcheck/setup.sh +++ b/plans/ccsdk/healthcheck/setup.sh @@ -18,7 +18,7 @@ # # Place the scripts in run order: SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source ${WORKSPACE}/test/csit/scripts/ccsdk/script1.sh +source ${WORKSPACE}/scripts/ccsdk/script1.sh export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) export NEXUS_DOCKER_REPO="nexus3.onap.org:10001" diff --git a/plans/ccsdk/healthcheck/testplan.txt b/plans/ccsdk/healthcheck/testplan.txt index affe635b..2cd8cdaf 100644 --- a/plans/ccsdk/healthcheck/testplan.txt +++ b/plans/ccsdk/healthcheck/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. ccsdk/healthcheck diff --git a/plans/clamp/APIs/setup.sh b/plans/clamp/APIs/setup.sh index bb7a8144..6e27495c 100755 --- a/plans/clamp/APIs/setup.sh +++ b/plans/clamp/APIs/setup.sh @@ -18,9 +18,9 @@ # # Place the scripts in run order: -source ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh +source ${WORKSPACE}/scripts/clamp/clone_clamp_and_change_dockercompose.sh -source ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh +source ${WORKSPACE}/scripts/clamp/start_clamp_containers.sh # Pass any variables required by Robot test suites in ROBOT_VARIABLES #ROBOT_VARIABLES="-v TEST:${TEST}" diff --git a/plans/clamp/APIs/teardown.sh b/plans/clamp/APIs/teardown.sh index 07067e60..0e10d770 100755 --- a/plans/clamp/APIs/teardown.sh +++ b/plans/clamp/APIs/teardown.sh @@ -17,6 +17,6 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -source ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh +source ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/plans/clamp/APIs/testplan.txt b/plans/clamp/APIs/testplan.txt index 9d328f52..9891853c 100644 --- a/plans/clamp/APIs/testplan.txt +++ b/plans/clamp/APIs/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. clamp/APIs diff --git a/plans/clamp/UIs/setup.sh b/plans/clamp/UIs/setup.sh index bb7a8144..6e27495c 100755 --- a/plans/clamp/UIs/setup.sh +++ b/plans/clamp/UIs/setup.sh @@ -18,9 +18,9 @@ # # Place the scripts in run order: -source ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh +source ${WORKSPACE}/scripts/clamp/clone_clamp_and_change_dockercompose.sh -source ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh +source ${WORKSPACE}/scripts/clamp/start_clamp_containers.sh # Pass any variables required by Robot test suites in ROBOT_VARIABLES #ROBOT_VARIABLES="-v TEST:${TEST}" diff --git a/plans/clamp/UIs/teardown.sh b/plans/clamp/UIs/teardown.sh index 07067e60..0e10d770 100755 --- a/plans/clamp/UIs/teardown.sh +++ b/plans/clamp/UIs/teardown.sh @@ -17,6 +17,6 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -source ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh +source ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/plans/clamp/UIs/testplan.txt b/plans/clamp/UIs/testplan.txt index 9ec5b953..d282425e 100644 --- a/plans/clamp/UIs/testplan.txt +++ b/plans/clamp/UIs/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. clamp/UIs diff --git a/plans/cli/sanity-check/testplan.txt b/plans/cli/sanity-check/testplan.txt index 477ddab1..2280f8b0 100644 --- a/plans/cli/sanity-check/testplan.txt +++ b/plans/cli/sanity-check/testplan.txt @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# 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. cli/startup/startup_check.robot diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh index 6f72521a..587b2680 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh @@ -37,4 +37,4 @@ docker-compose up -d mkdir -p ${WORKSPACE}/archives/containers_logs -export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries" +export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/libraries" diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt b/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt index e9a7f636..7b1a3331 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/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. dcaegen2-collectors-hv-ves/testcases diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh index 52167bf5..00892d6b 100644 --- a/plans/dcaegen2/prh-testsuites/setup.sh +++ b/plans/dcaegen2/prh-testsuites/setup.sh @@ -6,7 +6,7 @@ export PRH_SERVICE="prh" export DMAAP_SIMULATOR="dmaap_simulator" export AAI_SIMULATOR="aai_simulator" -cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/resources/ +cd ${WORKSPACE}/tests/dcaegen2/prh-testcases/resources/ pip uninstall -y docker-py pip uninstall -y docker diff --git a/plans/dcaegen2/prh-testsuites/testplan.txt b/plans/dcaegen2/prh-testsuites/testplan.txt index 9007a64b..728038a9 100644 --- a/plans/dcaegen2/prh-testsuites/testplan.txt +++ b/plans/dcaegen2/prh-testsuites/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. dcaegen2/prh-testcases diff --git a/plans/dcaegen2/testsuites/setup.sh b/plans/dcaegen2/testsuites/setup.sh index 8ee1309b..7847dce8 100755 --- a/plans/dcaegen2/testsuites/setup.sh +++ b/plans/dcaegen2/testsuites/setup.sh @@ -31,7 +31,7 @@ VESC_IP=`get-instance-ip.sh vesc` export VESC_IP=${VESC_IP} export HOST_IP=${HOST_IP} -export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources" +export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2/testcases/resources" pip install jsonschema uuid # Wait container ready diff --git a/plans/dcaegen2/testsuites/testplan.txt b/plans/dcaegen2/testsuites/testplan.txt index fbf08839..06810def 100755 --- a/plans/dcaegen2/testsuites/testplan.txt +++ b/plans/dcaegen2/testsuites/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. dcaegen2/testcases 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 diff --git a/plans/externalapi-nbi/healthcheck/setup.sh b/plans/externalapi-nbi/healthcheck/setup.sh index 50da7ad6..f292a138 100644 --- a/plans/externalapi-nbi/healthcheck/setup.sh +++ b/plans/externalapi-nbi/healthcheck/setup.sh @@ -14,4 +14,4 @@ # limitations under the License. # ======================================================================== -source ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh +source ${WORKSPACE}/scripts/externalapi-nbi/start_nbi_containers.sh diff --git a/plans/externalapi-nbi/healthcheck/teardown.sh b/plans/externalapi-nbi/healthcheck/teardown.sh index 83929723..fcca23e8 100644 --- a/plans/externalapi-nbi/healthcheck/teardown.sh +++ b/plans/externalapi-nbi/healthcheck/teardown.sh @@ -14,4 +14,4 @@ # limitations under the License. # ======================================================================== -source ${WORKSPACE}/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh
\ No newline at end of file +source ${WORKSPACE}/scripts/externalapi-nbi/delete_nbi_containers.sh
\ No newline at end of file diff --git a/plans/externalapi-nbi/healthcheck/testplan.txt b/plans/externalapi-nbi/healthcheck/testplan.txt index 06622ae7..8339c3cb 100644 --- a/plans/externalapi-nbi/healthcheck/testplan.txt +++ b/plans/externalapi-nbi/healthcheck/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. externalapi-nbi/healthcheck diff --git a/plans/holmes-rule-management/sanity-check/testplan.txt b/plans/holmes-rule-management/sanity-check/testplan.txt index e699512d..cc12b3fe 100644 --- a/plans/holmes-rule-management/sanity-check/testplan.txt +++ b/plans/holmes-rule-management/sanity-check/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. holmes/testcase/EngineMgt diff --git a/plans/integration/functionality1/setup.sh b/plans/integration/functionality1/setup.sh index c18f6220..3da509fd 100755 --- a/plans/integration/functionality1/setup.sh +++ b/plans/integration/functionality1/setup.sh @@ -15,7 +15,7 @@ # limitations under the License. # # Place the scripts in run order: -source ${WORKSPACE}/test/csit/scripts/integration/script1.sh +source ${WORKSPACE}/scripts/integration/script1.sh docker run --name i-mock -d jamesdbloom/mockserver MOCK_IP=`get-instance-ip.sh i-mock` @@ -27,7 +27,7 @@ for i in {1..10}; do sleep $i done -${WORKSPACE}/test/csit/scripts/integration/mock-hello.sh ${MOCK_IP} +${WORKSPACE}/scripts/integration/mock-hello.sh ${MOCK_IP} # Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP}" diff --git a/plans/integration/functionality1/testplan.txt b/plans/integration/functionality1/testplan.txt index 9221b475..e35e1cc0 100644 --- a/plans/integration/functionality1/testplan.txt +++ b/plans/integration/functionality1/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. # Temporary change to trigger verify job. integration/suite1 diff --git a/plans/integration/vCPE/testplan.txt b/plans/integration/vCPE/testplan.txt index 2b3d4ad5..4c8688ec 100644 --- a/plans/integration/vCPE/testplan.txt +++ b/plans/integration/vCPE/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. integration/vCPE diff --git a/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh b/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh index 03d07def..43e172ab 100644 --- a/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh +++ b/plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh @@ -18,5 +18,5 @@ # # Place the scripts in run order: -source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh +source ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh diff --git a/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh b/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh index 1ecaad4d..a4ba8eb4 100644 --- a/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh +++ b/plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh @@ -17,5 +17,5 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh +source ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh diff --git a/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt b/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt index f59237bd..5a917258 100644 --- a/plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt +++ b/plans/modeling-toscaparsers-javatoscachecker/APIs/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. modeling-toscaparsers-javatoscachecker/APIs diff --git a/plans/msb/iag-redirect-discovery/testplan.txt b/plans/msb/iag-redirect-discovery/testplan.txt index 54bb307b..0f807038 100644 --- a/plans/msb/iag-redirect-discovery/testplan.txt +++ b/plans/msb/iag-redirect-discovery/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. msb/rest-service-discovery msb/rest-service-api-gateway
\ No newline at end of file diff --git a/plans/msb/rest-service/testplan.txt b/plans/msb/rest-service/testplan.txt index 54bb307b..0f807038 100644 --- a/plans/msb/rest-service/testplan.txt +++ b/plans/msb/rest-service/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. msb/rest-service-discovery msb/rest-service-api-gateway
\ No newline at end of file diff --git a/plans/msb/sanity-check/testplan.txt b/plans/msb/sanity-check/testplan.txt index 0ef75071..c0067bba 100644 --- a/plans/msb/sanity-check/testplan.txt +++ b/plans/msb/sanity-check/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. msb/startup diff --git a/plans/msb/tcp-service/testplan.txt b/plans/msb/tcp-service/testplan.txt index ba8f6f28..a18c3579 100644 --- a/plans/msb/tcp-service/testplan.txt +++ b/plans/msb/tcp-service/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. msb/tcp-service-discovery msb/tcp-service-access
\ No newline at end of file diff --git a/plans/multicloud-ocata/functionality1/testplan.txt b/plans/multicloud-ocata/functionality1/testplan.txt index fcd795da..a8bd6c46 100644 --- a/plans/multicloud-ocata/functionality1/testplan.txt +++ b/plans/multicloud-ocata/functionality1/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. multicloud-ocata/provision/sanity_test_multicloud.robot diff --git a/plans/multicloud-ocata/hpa-discovery/setup.sh b/plans/multicloud-ocata/hpa-discovery/setup.sh index d17bec12..cc494e86 100644 --- a/plans/multicloud-ocata/hpa-discovery/setup.sh +++ b/plans/multicloud-ocata/hpa-discovery/setup.sh @@ -17,8 +17,8 @@ cd ${SCRIPTS} source common_functions.sh -generic_sim_path=${WORKSPACE}/test/csit/scripts/multicloud-ocata/generic_sim -multicloud_provision_path=${WORKSPACE}/test/csit/tests/multicloud-ocata/provision +generic_sim_path=${WORKSPACE}/scripts/multicloud-ocata/generic_sim +multicloud_provision_path=${WORKSPACE}/tests/multicloud-ocata/provision # start generic simulator for openstack mock and AAI mock if [[ -z $(docker images -q generic_sim) ]]; then pushd $generic_sim_path diff --git a/plans/multicloud-ocata/hpa-discovery/testplan.txt b/plans/multicloud-ocata/hpa-discovery/testplan.txt index 9394379e..d03e80bc 100644 --- a/plans/multicloud-ocata/hpa-discovery/testplan.txt +++ b/plans/multicloud-ocata/hpa-discovery/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. multicloud-ocata/provision/hpa_multicloud.robot diff --git a/plans/multicloud-pike/functionality1/testplan.txt b/plans/multicloud-pike/functionality1/testplan.txt index 7f460164..a2b9ab7b 100644 --- a/plans/multicloud-pike/functionality1/testplan.txt +++ b/plans/multicloud-pike/functionality1/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. multicloud-pike/provision/sanity_test_multicloud.robot diff --git a/plans/multicloud-pike/hpa-discovery/setup.sh b/plans/multicloud-pike/hpa-discovery/setup.sh index cbcc302e..73121139 100644 --- a/plans/multicloud-pike/hpa-discovery/setup.sh +++ b/plans/multicloud-pike/hpa-discovery/setup.sh @@ -17,8 +17,8 @@ cd ${SCRIPTS} source common_functions.sh -generic_sim_path=${WORKSPACE}/test/csit/scripts/multicloud-pike/generic_sim -multicloud_provision_path=${WORKSPACE}/test/csit/tests/multicloud-pike/provision +generic_sim_path=${WORKSPACE}/scripts/multicloud-pike/generic_sim +multicloud_provision_path=${WORKSPACE}/tests/multicloud-pike/provision # start generic simulator for openstack mock and AAI mock if [[ -z $(docker images -q generic_sim) ]]; then pushd $generic_sim_path diff --git a/plans/multicloud-pike/hpa-discovery/testplan.txt b/plans/multicloud-pike/hpa-discovery/testplan.txt index 5914cbba..4a71d55a 100644 --- a/plans/multicloud-pike/hpa-discovery/testplan.txt +++ b/plans/multicloud-pike/hpa-discovery/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. multicloud-pike/provision/hpa_multicloud.robot diff --git a/plans/multicloud-vmware/functionality1/testplan.txt b/plans/multicloud-vmware/functionality1/testplan.txt index 0a2ad45a..bb9097b0 100644 --- a/plans/multicloud-vmware/functionality1/testplan.txt +++ b/plans/multicloud-vmware/functionality1/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. multicloud-vmware/provision/sanity_test_vio.robot multicloud-vmware/provision/sanity_test_tenant.robot diff --git a/plans/multicloud-windriver/functionality1/testplan.txt b/plans/multicloud-windriver/functionality1/testplan.txt index e59320b1..c4f513e7 100644 --- a/plans/multicloud-windriver/functionality1/testplan.txt +++ b/plans/multicloud-windriver/functionality1/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. multicloud-windriver/provision/sanity_test_multicloud.robot diff --git a/plans/multicloud/functionality1/testplan.txt b/plans/multicloud/functionality1/testplan.txt index f515c64d..2daea3d7 100644 --- a/plans/multicloud/functionality1/testplan.txt +++ b/plans/multicloud/functionality1/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. multicloud/provision/sanity_test_multivim.robot 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 diff --git a/plans/optf-has/has/setup.sh b/plans/optf-has/has/setup.sh index a0bef71d..6f0e8836 100755 --- a/plans/optf-has/has/setup.sh +++ b/plans/optf-has/has/setup.sh @@ -20,17 +20,17 @@ # add here eventual scripts needed for music # echo "# music scripts calling"; -source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_script.sh +source ${WORKSPACE}/scripts/optf-has/has/music_script.sh # echo "# simulator scripts calling"; -source ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_script.sh +source ${WORKSPACE}/scripts/optf-has/has/simulator_script.sh # add here eventual scripts needed for optf/has # echo "# optf/has scripts calling"; -source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh +source ${WORKSPACE}/scripts/optf-has/has/has_script.sh # # add here below the start of all docker containers needed for optf/has CSIT testing diff --git a/plans/optf-has/has/teardown.sh b/plans/optf-has/has/teardown.sh index 41d7aff2..934d0e69 100755 --- a/plans/optf-has/has/teardown.sh +++ b/plans/optf-has/has/teardown.sh @@ -24,11 +24,11 @@ # optf/has scripts docker containers killing"; # echo "# optf/has has scripts calling"; -source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_teardown_script.sh +source ${WORKSPACE}/scripts/optf-has/has/has_teardown_script.sh echo "# optf/has simulator scripts calling"; -source ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_teardown_script.sh +source ${WORKSPACE}/scripts/optf-has/has/simulator_teardown_script.sh echo "# optf/has music scripts calling"; -source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_teardown_script.sh +source ${WORKSPACE}/scripts/optf-has/has/music_teardown_script.sh diff --git a/plans/optf-has/has/testplan.txt b/plans/optf-has/has/testplan.txt index 980050c9..bf922705 100644 --- a/plans/optf-has/has/testplan.txt +++ b/plans/optf-has/has/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. optf-has/has diff --git a/plans/policy/apex-pdp/testplan.txt b/plans/policy/apex-pdp/testplan.txt index cee9abda..07096cfa 100644 --- a/plans/policy/apex-pdp/testplan.txt +++ b/plans/policy/apex-pdp/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. policy/apex-pdp/apex-pdp-test.robot diff --git a/plans/policy/distribution/testplan.txt b/plans/policy/distribution/testplan.txt index 6f74cce4..bfd8192e 100644 --- a/plans/policy/distribution/testplan.txt +++ b/plans/policy/distribution/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. policy/distribution/distribution-test.robot diff --git a/plans/policy/health/setup.sh b/plans/policy/health/setup.sh index 21f58eb6..890df9b4 100755 --- a/plans/policy/health/setup.sh +++ b/plans/policy/health/setup.sh @@ -30,9 +30,9 @@ for i in {1..10}; do sleep $i done -${WORKSPACE}/test/csit/scripts/policy/mock-hello.sh ${MOCK_IP} +${WORKSPACE}/scripts/policy/mock-hello.sh ${MOCK_IP} -source ${WORKSPACE}/test/csit/scripts/policy/script1.sh +source ${WORKSPACE}/scripts/policy/script1.sh # Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" diff --git a/plans/policy/health/testplan.txt b/plans/policy/health/testplan.txt index bb858748..ab8a5b08 100644 --- a/plans/policy/health/testplan.txt +++ b/plans/policy/health/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. policy/suite1 diff --git a/plans/portal-sdk/testsuite/testplan.txt b/plans/portal-sdk/testsuite/testplan.txt index 27f8af34..75e5af0b 100644 --- a/plans/portal-sdk/testsuite/testplan.txt +++ b/plans/portal-sdk/testsuite/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. portal-sdk/testsuites diff --git a/plans/portal/testsuite/testplan.txt b/plans/portal/testsuite/testplan.txt index d7b18a5c..a2d396af 100644 --- a/plans/portal/testsuite/testplan.txt +++ b/plans/portal/testsuite/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. portal/testsuites diff --git a/plans/sdc/nightly/setup.sh b/plans/sdc/nightly/setup.sh index a7bbaa8e..ff310a5a 100644 --- a/plans/sdc/nightly/setup.sh +++ b/plans/sdc/nightly/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ${WORKSPACE}/test/csit/scripts/sdc/setup_sdc_for_apis_sanity.sh +source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh BE_IP=`get-instance-ip.sh sdc-BE` echo BE_IP=${BE_IP} diff --git a/plans/sdc/nightly/teardown.sh b/plans/sdc/nightly/teardown.sh index 2074d10f..6e99c469 100644 --- a/plans/sdc/nightly/teardown.sh +++ b/plans/sdc/nightly/teardown.sh @@ -1,3 +1,3 @@ #!/bin/bash -source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh +source ${WORKSPACE}/scripts/sdc/kill_containers_and_remove_dataFolders.sh diff --git a/plans/sdc/nightly/testplan.txt b/plans/sdc/nightly/testplan.txt index 3011ad5c..83a6d9fc 100644 --- a/plans/sdc/nightly/testplan.txt +++ b/plans/sdc/nightly/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. sdc/nightly diff --git a/plans/sdc/sanity/setup.sh b/plans/sdc/sanity/setup.sh index a7bbaa8e..ff310a5a 100644 --- a/plans/sdc/sanity/setup.sh +++ b/plans/sdc/sanity/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ${WORKSPACE}/test/csit/scripts/sdc/setup_sdc_for_apis_sanity.sh +source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh BE_IP=`get-instance-ip.sh sdc-BE` echo BE_IP=${BE_IP} diff --git a/plans/sdc/sanity/teardown.sh b/plans/sdc/sanity/teardown.sh index 2074d10f..6e99c469 100644 --- a/plans/sdc/sanity/teardown.sh +++ b/plans/sdc/sanity/teardown.sh @@ -1,3 +1,3 @@ #!/bin/bash -source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh +source ${WORKSPACE}/scripts/sdc/kill_containers_and_remove_dataFolders.sh diff --git a/plans/sdc/sanity/testplan.txt b/plans/sdc/sanity/testplan.txt index 801f37d3..9f21c693 100644 --- a/plans/sdc/sanity/testplan.txt +++ b/plans/sdc/sanity/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. sdc/sanity diff --git a/plans/sdc/uiSanity/setup.sh b/plans/sdc/uiSanity/setup.sh index 8f2bafda..0a8d56c0 100644 --- a/plans/sdc/uiSanity/setup.sh +++ b/plans/sdc/uiSanity/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ${WORKSPACE}/test/csit/scripts/sdc/setup_sdc_for_ui_sanity.sh +source ${WORKSPACE}/scripts/sdc/setup_sdc_for_ui_sanity.sh BE_IP=`get-instance-ip.sh sdc-BE` echo BE_IP=${BE_IP} diff --git a/plans/sdc/uiSanity/teardown.sh b/plans/sdc/uiSanity/teardown.sh index 2074d10f..6e99c469 100644 --- a/plans/sdc/uiSanity/teardown.sh +++ b/plans/sdc/uiSanity/teardown.sh @@ -1,3 +1,3 @@ #!/bin/bash -source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh +source ${WORKSPACE}/scripts/sdc/kill_containers_and_remove_dataFolders.sh diff --git a/plans/sdc/uiSanity/testplan.txt b/plans/sdc/uiSanity/testplan.txt index 801f37d3..9f21c693 100644 --- a/plans/sdc/uiSanity/testplan.txt +++ b/plans/sdc/uiSanity/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. sdc/sanity diff --git a/plans/sdnc/healthcheck/setup.sh b/plans/sdnc/healthcheck/setup.sh index 991ba18b..dfbd32cc 100644 --- a/plans/sdnc/healthcheck/setup.sh +++ b/plans/sdnc/healthcheck/setup.sh @@ -18,7 +18,7 @@ # # Place the scripts in run order: SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source ${WORKSPACE}/test/csit/scripts/sdnc/script1.sh +source ${WORKSPACE}/scripts/sdnc/script1.sh export NEXUS_USERNAME=docker export NEXUS_PASSWD=docker diff --git a/plans/sdnc/healthcheck/testplan.txt b/plans/sdnc/healthcheck/testplan.txt index 3fa8dde5..789104a9 100644 --- a/plans/sdnc/healthcheck/testplan.txt +++ b/plans/sdnc/healthcheck/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. sdnc/healthcheck diff --git a/plans/so/integration-testing/setup.sh b/plans/so/integration-testing/setup.sh index cd0cbdc3..02c21f6e 100644 --- a/plans/so/integration-testing/setup.sh +++ b/plans/so/integration-testing/setup.sh @@ -18,10 +18,10 @@ # Start all process required for executing test case #start mariadb -docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/test/csit/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d -v ${WORKSPACE}/test/csit/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb +docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d -v ${WORKSPACE}/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb #start so -docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/test/csit/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest +docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest SO_IP=`get-instance-ip.sh so` diff --git a/plans/so/integration-testing/testplan.txt b/plans/so/integration-testing/testplan.txt index 761c75c0..ed3ab5aa 100644 --- a/plans/so/integration-testing/testplan.txt +++ b/plans/so/integration-testing/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. so/sanity-check/sanity_test_so.robot
\ No newline at end of file diff --git a/plans/usecase-ui-server/testsuite/testplan.txt b/plans/usecase-ui-server/testsuite/testplan.txt index ec7f200a..af74191f 100644 --- a/plans/usecase-ui-server/testsuite/testplan.txt +++ b/plans/usecase-ui-server/testsuite/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. usecase-ui/server/test.robot diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index f27bfba5..796b1711 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -57,7 +57,7 @@ git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master cd datarouter cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ rm -rf docker-compose.yml -cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml +cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d docker kill datarouter-prov @@ -121,7 +121,7 @@ pip install jsonschema uuid sleep 2 # Data File Collector configuration : -cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/ +cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/ sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json docker cp /tmp/datafile_endpoints.json dfc:/config/ @@ -129,13 +129,13 @@ docker restart dfc # SFTP Configuration: # Update the File Ready Notification with actual sftp ip address and copy pm files to sftp server. -cp $WORKSPACE/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json $WORKSPACE/test/csit/tests/usecases/5G-bulkpm-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json -sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json -docker cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/admin/ +cp $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json $WORKSPACE/tests/usecases/5G-bulkpm-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json +sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json +docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/admin/ # Data Router Configuration: # Create default feed and create file consumer subscriber on data router -curl -v -X POST -H "Content-Type:application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443 -cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json +curl -v -X POST -H "Content-Type:application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443 +cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json sed -i 's/fileconsumer/'${DR_SUBSCIBER_IP}'/g' /tmp/addSubscriber.json curl -v -X POST -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1ii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
\ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/testplan.txt b/plans/usecases/5G-bulkpm/testplan.txt index c4e1c427..feeffcc7 100644 --- a/plans/usecases/5G-bulkpm/testplan.txt +++ b/plans/usecases/5G-bulkpm/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. usecases/5G-bulkpm diff --git a/plans/vfc-gvnfm-vnflcm/sanity-check/testplan.txt b/plans/vfc-gvnfm-vnflcm/sanity-check/testplan.txt index 0aa2e3e2..6627c580 100644 --- a/plans/vfc-gvnfm-vnflcm/sanity-check/testplan.txt +++ b/plans/vfc-gvnfm-vnflcm/sanity-check/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. vfc/gvnfm-vnflcm/test.robot diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt b/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt index 960f7325..c90cc935 100644 --- a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt +++ b/plans/vfc-gvnfm-vnfmgr/sanity-check/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. vfc/gvnfm-vnfmgr/test.robot diff --git a/plans/vfc-gvnfm-vnfres/sanity-check/testplan.txt b/plans/vfc-gvnfm-vnfres/sanity-check/testplan.txt index e94e2946..ac51e674 100644 --- a/plans/vfc-gvnfm-vnfres/sanity-check/testplan.txt +++ b/plans/vfc-gvnfm-vnfres/sanity-check/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. vfc/gvnfm-vnfres/test.robot diff --git a/plans/vfc-nfvo-catalog/sanity-check/testplan.txt b/plans/vfc-nfvo-catalog/sanity-check/testplan.txt index 6c8c54a9..3c5f813a 100644 --- a/plans/vfc-nfvo-catalog/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-catalog/sanity-check/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. vfc/nfvo-catalog/test.robot diff --git a/plans/vfc-nfvo-driver-ems/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-ems/sanity-check/testplan.txt index 747f8683..cb2a8026 100644 --- a/plans/vfc-nfvo-driver-ems/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-driver-ems/sanity-check/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. vfc/nfvo-driver-ems/test.robot diff --git a/plans/vfc-nfvo-driver-sfc/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-sfc/sanity-check/testplan.txt index 9de2acce..3fa996f6 100644 --- a/plans/vfc-nfvo-driver-sfc/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-driver-sfc/sanity-check/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. vfc/nfvo-driver-sfc/test.robot diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt index e7bee519..a54f095c 100644 --- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/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. vfc/nfvo-driver-gvnfm/gvnfmdriver.robot diff --git a/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt index 7eb861ed..08317f72 100644 --- a/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/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. vfc/nfvo-driver-svnfm/ztevmanager.robot diff --git a/plans/vfc-nfvo-lcm/sanity-check/testplan.txt b/plans/vfc-nfvo-lcm/sanity-check/testplan.txt index fc261e13..2e0a32d5 100644 --- a/plans/vfc-nfvo-lcm/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-lcm/sanity-check/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. vfc/nfvo-lcm/test.robot diff --git a/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt b/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt index f81be8ec..5d1c6e9d 100644 --- a/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-multivimproxy/sanity-check/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. vfc/nfvo-multivimproxy/test.robot
\ No newline at end of file diff --git a/plans/vfc-nfvo-resmanagement/sanity-check/testplan.txt b/plans/vfc-nfvo-resmanagement/sanity-check/testplan.txt index 98dac63b..ae6d3a56 100644 --- a/plans/vfc-nfvo-resmanagement/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-resmanagement/sanity-check/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. vfc/nfvo-resmanagement/test.robot
\ No newline at end of file diff --git a/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt b/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt index ff9f4d5d..2d03683d 100644 --- a/plans/vfc-nfvo-wfengine/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-wfengine/sanity-check/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. vfc/nfvo-wfengine/workflow.robot
\ No newline at end of file diff --git a/plans/vid/healthCheck/setup.sh b/plans/vid/healthCheck/setup.sh index ce308cfa..a0ed2262 100644 --- a/plans/vid/healthCheck/setup.sh +++ b/plans/vid/healthCheck/setup.sh @@ -21,9 +21,9 @@ /usr/bin/Xvfb :0 -screen 0 1024x768x24& export DISPLAY=:0 -source ${WORKSPACE}/test/csit/scripts/vid/clone_and_setup_vid_data.sh +source ${WORKSPACE}/scripts/vid/clone_and_setup_vid_data.sh -source ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh +source ${WORKSPACE}/scripts/vid/start_vid_containers.sh BE_IP=`get-instance-ip.sh vid-server` diff --git a/plans/vid/healthCheck/teardown.sh b/plans/vid/healthCheck/teardown.sh index e82ef306..01383179 100644 --- a/plans/vid/healthCheck/teardown.sh +++ b/plans/vid/healthCheck/teardown.sh @@ -17,6 +17,6 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -source ${WORKSPACE}/test/csit/scripts/vid/kill_containers_and_remove_dataFolders.sh +source ${WORKSPACE}/scripts/vid/kill_containers_and_remove_dataFolders.sh # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging diff --git a/plans/vid/healthCheck/testplan.txt b/plans/vid/healthCheck/testplan.txt index 92d8b058..cb5e2798 100644 --- a/plans/vid/healthCheck/testplan.txt +++ b/plans/vid/healthCheck/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. vid/healthCheck vid/login diff --git a/plans/vnfsdk-ice/sanity-check/testplan.txt b/plans/vnfsdk-ice/sanity-check/testplan.txt index c84eb031..a18db188 100644 --- a/plans/vnfsdk-ice/sanity-check/testplan.txt +++ b/plans/vnfsdk-ice/sanity-check/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. vnfsdk-ice/ice-server/validation_test.robot diff --git a/plans/vnfsdk-marketplace/sanity-check/testplan.txt b/plans/vnfsdk-marketplace/sanity-check/testplan.txt index 730df014..b5370f38 100644 --- a/plans/vnfsdk-marketplace/sanity-check/testplan.txt +++ b/plans/vnfsdk-marketplace/sanity-check/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. vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot diff --git a/plans/vnfsdk-pkgtools/sanity-check/testplan.txt b/plans/vnfsdk-pkgtools/sanity-check/testplan.txt index 05ff05a2..8617c200 100644 --- a/plans/vnfsdk-pkgtools/sanity-check/testplan.txt +++ b/plans/vnfsdk-pkgtools/sanity-check/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. vnfsdk-pkgtools/tosca-metadata/create_open.robot vnfsdk-pkgtools/tosca-metadata/create_validate_digest_signing.robot diff --git a/plans/vnfsdk-refrepo/sanity-check/testplan.txt b/plans/vnfsdk-refrepo/sanity-check/testplan.txt index 730df014..b5370f38 100644 --- a/plans/vnfsdk-refrepo/sanity-check/testplan.txt +++ b/plans/vnfsdk-refrepo/sanity-check/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. vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot diff --git a/plans/vvp/sanity/setup.sh b/plans/vvp/sanity/setup.sh index cab074c0..12bb6011 100644 --- a/plans/vvp/sanity/setup.sh +++ b/plans/vvp/sanity/setup.sh @@ -19,16 +19,16 @@ # Place the scripts in run order: -source ${WORKSPACE}/test/csit/scripts/vvp/clone_and_setup_vvp_data.sh +source ${WORKSPACE}/scripts/vvp/clone_and_setup_vvp_data.sh -source ${WORKSPACE}/test/csit/scripts/vvp/start_vvp_containers.sh +source ${WORKSPACE}/scripts/vvp/start_vvp_containers.sh -source ${WORKSPACE}/test/csit/scripts/vvp/docker_health.sh +source ${WORKSPACE}/scripts/vvp/docker_health.sh -source ${WORKSPACE}/test/csit/scripts/vvp/start_vvp_sanity.sh +source ${WORKSPACE}/scripts/vvp/start_vvp_sanity.sh -VVP_IP=`${WORKSPACE}/test/csit/scripts/get-instance-ip.sh vvp-engagementmgr` +VVP_IP=`${WORKSPACE}/scripts/get-instance-ip.sh vvp-engagementmgr` echo VVP_IP=${VVP_IP} diff --git a/plans/vvp/sanity/teardown.sh b/plans/vvp/sanity/teardown.sh index b0f33a64..3369c029 100644 --- a/plans/vvp/sanity/teardown.sh +++ b/plans/vvp/sanity/teardown.sh @@ -17,4 +17,4 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -source ${WORKSPACE}/test/csit/scripts/vvp/kill_containers_and_remove_dataFolders.sh +source ${WORKSPACE}/scripts/vvp/kill_containers_and_remove_dataFolders.sh diff --git a/plans/vvp/sanity/testplan.txt b/plans/vvp/sanity/testplan.txt index 0acb5083..4957ef6f 100644 --- a/plans/vvp/sanity/testplan.txt +++ b/plans/vvp/sanity/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. vvp/sanity |