diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-09-27 11:31:33 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-09-27 12:18:06 -0700 |
commit | 13111e94c63f26b3234ae28ff46df3ce8392636d (patch) | |
tree | a096f2d49dc381e2b282aad9dbbd9d5ff161eabd /scripts | |
parent | 9abb61ca2cea1907cab2cec312d6dca6e53a93cd (diff) |
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>
Diffstat (limited to 'scripts')
32 files changed, 55 insertions, 55 deletions
diff --git a/scripts/appc/script1.sh b/scripts/appc/script1.sh index 1c3d92ee..1b41a123 100755 --- a/scripts/appc/script1.sh +++ b/scripts/appc/script1.sh @@ -17,4 +17,4 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -echo "This is ${WORKSPACE}/test/csit/scripts/appc/script1.sh" +echo "This is ${WORKSPACE}/scripts/appc/script1.sh" diff --git a/scripts/ccsdk/script1.sh b/scripts/ccsdk/script1.sh index bb583f85..223479e2 100644 --- a/scripts/ccsdk/script1.sh +++ b/scripts/ccsdk/script1.sh @@ -17,4 +17,4 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -echo "This is ${WORKSPACE}/test/csit/scripts/ccsdk/script1.sh" +echo "This is ${WORKSPACE}/scripts/ccsdk/script1.sh" diff --git a/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/scripts/clamp/clone_clamp_and_change_dockercompose.sh index e564e637..c2c0de4d 100755 --- a/scripts/clamp/clone_clamp_and_change_dockercompose.sh +++ b/scripts/clamp/clone_clamp_and_change_dockercompose.sh @@ -22,7 +22,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh" +echo "This is ${WORKSPACE}/scripts/clamp/clone_clamp_and_change_dockercompose.sh" firefox --version which firefox diff --git a/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh b/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh index c94a40bc..31eb7560 100755 --- a/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh +++ b/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh @@ -17,7 +17,7 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -echo "This is ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh" +echo "This is ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh" kill-instance.sh clamp_clamp_1 kill-instance.sh clamp_db_1 diff --git a/scripts/clamp/start_clamp_containers.sh b/scripts/clamp/start_clamp_containers.sh index 23b1705e..8a176fbf 100755 --- a/scripts/clamp/start_clamp_containers.sh +++ b/scripts/clamp/start_clamp_containers.sh @@ -22,7 +22,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh" +echo "This is ${WORKSPACE}/scripts/clamp/start_clamp_containers.sh" # start Clamp and MariaDB containers with docker compose and configuration from clamp/extra/docker/clamp/docker-compose.yml docker-compose up -d diff --git a/scripts/cli/startup.sh b/scripts/cli/startup.sh index 6e29a0e8..243d358a 100644 --- a/scripts/cli/startup.sh +++ b/scripts/cli/startup.sh @@ -15,4 +15,4 @@ # limitations under the License. # # $1 nickname for the MSB instance -echo "This is ${WORKSPACE}/test/csit/scripts/cli/startup.sh" +echo "This is ${WORKSPACE}/scripts/cli/startup.sh" diff --git a/scripts/dmaap-buscontroller/.mock-aaf.sh.swp b/scripts/dmaap-buscontroller/.mock-aaf.sh.swp Binary files differdeleted file mode 100644 index edadfe90..00000000 --- a/scripts/dmaap-buscontroller/.mock-aaf.sh.swp +++ /dev/null diff --git a/scripts/dmaap-buscontroller/dmaapbc-launch.sh b/scripts/dmaap-buscontroller/dmaapbc-launch.sh index 317c17f1..079b6644 100755 --- a/scripts/dmaap-buscontroller/dmaapbc-launch.sh +++ b/scripts/dmaap-buscontroller/dmaapbc-launch.sh @@ -8,7 +8,7 @@ function dmaapbc_launch() { CONTAINER_NAME=dmaapbc IP="" - cd ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller + cd ${WORKSPACE}/scripts/dmaap-buscontroller TMP_CFG=/tmp/docker-databus-controller.conf . ./onapCSIT.env > $TMP_CFG diff --git a/scripts/dmaap-buscontroller/start-mock.sh b/scripts/dmaap-buscontroller/start-mock.sh index b4707c5a..d50125a4 100755 --- a/scripts/dmaap-buscontroller/start-mock.sh +++ b/scripts/dmaap-buscontroller/start-mock.sh @@ -39,7 +39,7 @@ function start_mock() { done set -x - ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/init-mock-${app}.sh ${IP} + ${WORKSPACE}/scripts/dmaap-buscontroller/init-mock-${app}.sh ${IP} set +x # this is the output of this function diff --git a/scripts/externalapi-nbi/delete_nbi_containers.sh b/scripts/externalapi-nbi/delete_nbi_containers.sh index 76be3289..bc0d8b09 100644 --- a/scripts/externalapi-nbi/delete_nbi_containers.sh +++ b/scripts/externalapi-nbi/delete_nbi_containers.sh @@ -14,7 +14,7 @@ # limitations under the License. # ======================================================================== -echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh" +echo "This is ${WORKSPACE}/scripts/externalapi-nbi/delete_nbi_containers.sh" # Check if docker-compose file exists if [ ! -f "$WORKSPACE/externalapi-nbi/docker-compose.yml" ]; then diff --git a/scripts/externalapi-nbi/start_nbi_containers.sh b/scripts/externalapi-nbi/start_nbi_containers.sh index 68fbb029..69007f29 100644 --- a/scripts/externalapi-nbi/start_nbi_containers.sh +++ b/scripts/externalapi-nbi/start_nbi_containers.sh @@ -19,7 +19,7 @@ NEXUS_PASSWD=docker export NEXUS_DOCKER_REPO=nexus3.onap.org:10001 export DOCKER_IMAGE_VERSION=latest -echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh" +echo "This is ${WORKSPACE}/scripts/externalapi-nbi/start_nbi_containers.sh" # Create directory mkdir -p $WORKSPACE/externalapi-nbi diff --git a/scripts/integration/script1.sh b/scripts/integration/script1.sh index 05d57e84..4c8921a0 100755 --- a/scripts/integration/script1.sh +++ b/scripts/integration/script1.sh @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -echo "This is ${WORKSPACE}/test/csit/scripts/integration/script1.sh" +echo "This is ${WORKSPACE}/scripts/integration/script1.sh" diff --git a/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh b/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh index 3521ff1c..d11c9e81 100644 --- a/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh +++ b/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh @@ -20,7 +20,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh" +echo "This is ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh" #start docker image run-instance.sh nexus3.onap.org:10001/onap/modeling/javatoscachecker:latest modeling_javatoscachecker_1 "-p 8080:8080" diff --git a/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh b/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh index cca4fe19..aa82cf21 100644 --- a/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh +++ b/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh @@ -20,7 +20,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh" +echo "This is ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh" kill-instance.sh modeling_javatoscachecker_1 diff --git a/scripts/music/music-scripts/music_script.sh b/scripts/music/music-scripts/music_script.sh index f16062ad..172ca5b5 100755 --- a/scripts/music/music-scripts/music_script.sh +++ b/scripts/music/music-scripts/music_script.sh @@ -16,7 +16,7 @@ # echo "######################################################################" echo "### " -echo "### This is ${WORKSPACE}/test/csit/scripts/music/music-scripts/music_script.sh" +echo "### This is ${WORKSPACE}/scripts/music/music-scripts/music_script.sh" echo "### " echo "######################################################################" # diff --git a/scripts/optf-has/has/has_proxy_settings.sh b/scripts/optf-has/has/has_proxy_settings.sh index 92f8d93c..48096103 100755 --- a/scripts/optf-has/has/has_proxy_settings.sh +++ b/scripts/optf-has/has/has_proxy_settings.sh @@ -15,7 +15,7 @@ # limitations under the License. # # put into this file local proxy settings in case they are needed on your local environment -echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/has_proxy_settings.sh" +echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh" echo "optf/has proxy settings" if [ "$#" -eq "1" ]; then diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh index 2d2eff3b..24ecc063 100755 --- a/scripts/optf-has/has/has_script.sh +++ b/scripts/optf-has/has/has_script.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh" +echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_script.sh" # # add here whatever commands is needed to prepare the optf/has CSIT testing # @@ -38,11 +38,11 @@ BUNDLE=/tmp/conductor/properties/cert.pem mkdir -p /tmp/conductor/properties mkdir -p /tmp/conductor/logs -cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf -cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/log.conf.onap /tmp/conductor/properties/log.conf -cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.cer /tmp/conductor/properties/cert.cer -cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.key /tmp/conductor/properties/cert.key -cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.pem /tmp/conductor/properties/cert.pem +cp ${WORKSPACE}/scripts/optf-has/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf +cp ${WORKSPACE}/scripts/optf-has/has/has-properties/log.conf.onap /tmp/conductor/properties/log.conf +cp ${WORKSPACE}/scripts/optf-has/has/has-properties/cert.cer /tmp/conductor/properties/cert.cer +cp ${WORKSPACE}/scripts/optf-has/has/has-properties/cert.key /tmp/conductor/properties/cert.key +cp ${WORKSPACE}/scripts/optf-has/has/has-properties/cert.pem /tmp/conductor/properties/cert.pem #chmod -R 777 /tmp/conductor/properties MUSIC_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat` @@ -68,7 +68,7 @@ echo "Query MUSIC to check for reachability. Query Version" curl -vvvvv --noproxy "*" --request GET http://${MUSIC_IP}:8080/MUSIC/rest/v2/version -H "Content-Type: application/json" echo "Onboard conductor into music" -curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/test/csit/tests/optf-has/has/data/onboard.json +curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/tests/optf-has/has/data/onboard.json docker run -d --name cond-cont -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf sleep 20 @@ -82,7 +82,7 @@ docker run -d --name cond-data -v ${COND_CONF}:/usr/local/bin/conductor.conf -v sleep 20 COND_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' cond-api` -${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${COND_IP} 8091 +${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${COND_IP} 8091 echo "inspect docker things for tracing purpose" docker inspect cond-data diff --git a/scripts/optf-has/has/music_script.sh b/scripts/optf-has/has/music_script.sh index 7693d7b3..811a39c2 100755 --- a/scripts/optf-has/has/music_script.sh +++ b/scripts/optf-has/has/music_script.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/music_script.sh" +echo "### This is ${WORKSPACE}/scripts/optf-has/has/music_script.sh" # # add here whatever commands is needed to prepare the music setup for optf-has CSIT testing # @@ -31,7 +31,7 @@ MUSIC_IMG=nexus3.onap.org:10001/onap/music/music:2.5.3 WORK_DIR=/tmp/music CASS_USERNAME=nelson24 CASS_PASSWORD=winman123 -MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/test/csit/scripts/optf-has/has/music-properties +MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/scripts/optf-has/has/music-properties MUSIC_PROPERTIES=/tmp/music/properties MUSIC_LOGS=/tmp/music/logs mkdir -p ${MUSIC_PROPERTIES} @@ -50,7 +50,7 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001" #CASSA_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-db` 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 sleep 150 # Start Music war docker run -d --name music-war -v music-vol:/app ${MUSIC_IMG}; @@ -77,7 +77,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/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080 +${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080 # wait a while to make sure music is totally up and configured sleep 90 diff --git a/scripts/optf-has/has/simulator_script.sh b/scripts/optf-has/has/simulator_script.sh index 2e8a0e6f..42dcd57f 100755 --- a/scripts/optf-has/has/simulator_script.sh +++ b/scripts/optf-has/has/simulator_script.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_script.sh" +echo "### This is ${WORKSPACE}/scripts/optf-has/has/simulator_script.sh" # # add here whatever commands is needed to prepare the optf/has CSIT testing # @@ -39,7 +39,7 @@ git clone https://gerrit.onap.org/r/optf/has if [ ${USER} != 'jenkins' ]; then # add proxy settings into this script when you work behind a proxy - ${WORKSPACE}/test/csit/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR} + ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR} fi @@ -58,7 +58,7 @@ docker run -d --name aaisim -p 8081:8081 aaisim AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim` echo "AAISIM_IP=${AAISIM_IP}" -${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081 +${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081 # prepare multicloudsim cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/multicloudsim/ @@ -75,7 +75,7 @@ docker run -d --name multicloudsim -p 8082:8082 multicloudsim MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim` echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}" -${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082 +${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082 # wait a while before continuing sleep 2 diff --git a/scripts/policy/script1.sh b/scripts/policy/script1.sh index 12509eda..b38401e3 100755 --- a/scripts/policy/script1.sh +++ b/scripts/policy/script1.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -echo "This is ${WORKSPACE}/test/csit/scripts/policy/script1.sh" +echo "This is ${WORKSPACE}/scripts/policy/script1.sh" # the directory of the script diff --git a/scripts/run-instance.sh b/scripts/run-instance.sh index 84ab3439..7ccc895a 100755 --- a/scripts/run-instance.sh +++ b/scripts/run-instance.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# $1 docker image path under ${WORKSPACE}/test/csit/docker/ +# $1 docker image path under ${WORKSPACE}/docker/ # $2 nickname for the instance # $3 docker run options, e.g. variables diff --git a/scripts/sdc/kill_containers_and_remove_dataFolders.sh b/scripts/sdc/kill_containers_and_remove_dataFolders.sh index a4e933ff..f231a262 100644 --- a/scripts/sdc/kill_containers_and_remove_dataFolders.sh +++ b/scripts/sdc/kill_containers_and_remove_dataFolders.sh @@ -17,7 +17,7 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -echo "This is ${WORKSPACE}/test/csit/scripts/sdc/kill_and_remove_dataFolder.sh" +echo "This is ${WORKSPACE}/scripts/sdc/kill_and_remove_dataFolder.sh" # copy logs to archive diff --git a/scripts/sdc/setup_sdc_for_apis_sanity.sh b/scripts/sdc/setup_sdc_for_apis_sanity.sh index 41d3d2aa..c1442d1f 100644 --- a/scripts/sdc/setup_sdc_for_apis_sanity.sh +++ b/scripts/sdc/setup_sdc_for_apis_sanity.sh @@ -2,7 +2,7 @@ set -x -echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh" +echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_sdc_data.sh" # Clone sdc enviroment template mkdir -p ${WORKSPACE}/data/environments/ @@ -39,15 +39,15 @@ source ${WORKSPACE}/data/clone/sdc/version.properties export RELEASE=$major.$minor-STAGING-latest export DEP_ENV=$ENV_NAME -cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/test/csit/scripts/sdc/ -#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh +cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/ +#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/scripts/sdc/docker_run.sh +#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/scripts/sdc/docker_run.sh +#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/scripts/sdc/docker_run.sh source ${WORKSPACE}/data/clone/sdc/version.properties export RELEASE=$major.$minor-STAGING-latest -${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tad +${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tad sleep 120 diff --git a/scripts/sdc/setup_sdc_for_ui_sanity.sh b/scripts/sdc/setup_sdc_for_ui_sanity.sh index 81b43d21..6f8a2328 100644 --- a/scripts/sdc/setup_sdc_for_ui_sanity.sh +++ b/scripts/sdc/setup_sdc_for_ui_sanity.sh @@ -2,7 +2,7 @@ set -x -echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh" +echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_sdc_data.sh" # Clone sdc enviroment template mkdir -p ${WORKSPACE}/data/environments/ @@ -39,15 +39,15 @@ source ${WORKSPACE}/data/clone/sdc/version.properties export RELEASE=$major.$minor-STAGING-latest export DEP_ENV=$ENV_NAME -cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/test/csit/scripts/sdc/ -#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh +cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/ +#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/scripts/sdc/docker_run.sh +#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/scripts/sdc/docker_run.sh +#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/scripts/sdc/docker_run.sh source ${WORKSPACE}/data/clone/sdc/version.properties export RELEASE=$major.$minor-STAGING-latest -${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tud +${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tud sleep 120 diff --git a/scripts/sdc/start_sdc_containers.sh b/scripts/sdc/start_sdc_containers.sh index 5bc8770b..2aa43314 100644 --- a/scripts/sdc/start_sdc_containers.sh +++ b/scripts/sdc/start_sdc_containers.sh @@ -22,7 +22,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_containers.sh" +echo "This is ${WORKSPACE}/scripts/sdc/start_sdc_containers.sh" source ${WORKSPACE}/data/clone/sdc/version.properties export RELEASE=$major.$minor-STAGING-latest diff --git a/scripts/sdnc/script1.sh b/scripts/sdnc/script1.sh index b87e3c19..9bd1a225 100644 --- a/scripts/sdnc/script1.sh +++ b/scripts/sdnc/script1.sh @@ -17,4 +17,4 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -echo "This is ${WORKSPACE}/test/csit/scripts/sdnc/script1.sh" +echo "This is ${WORKSPACE}/scripts/sdnc/script1.sh" diff --git a/scripts/vid/clone_and_setup_vid_data.sh b/scripts/vid/clone_and_setup_vid_data.sh index 917016c7..b236d3ad 100644 --- a/scripts/vid/clone_and_setup_vid_data.sh +++ b/scripts/vid/clone_and_setup_vid_data.sh @@ -22,7 +22,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_vid_data.sh" +echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_vid_data.sh" # Clone sdc enviroment template diff --git a/scripts/vid/kill_containers_and_remove_dataFolders.sh b/scripts/vid/kill_containers_and_remove_dataFolders.sh index 33a799d5..9e72a42f 100644 --- a/scripts/vid/kill_containers_and_remove_dataFolders.sh +++ b/scripts/vid/kill_containers_and_remove_dataFolders.sh @@ -17,7 +17,7 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -echo "This is ${WORKSPACE}/test/csit/scripts/vid/kill_and_remove_dataFolder.sh" +echo "This is ${WORKSPACE}/scripts/vid/kill_and_remove_dataFolder.sh" #kill and remove all vid dockers docker stop $(docker ps -a -q --filter="name=vid") diff --git a/scripts/vid/start_vid_containers.sh b/scripts/vid/start_vid_containers.sh index c4bdae2d..a058e1fb 100644 --- a/scripts/vid/start_vid_containers.sh +++ b/scripts/vid/start_vid_containers.sh @@ -21,11 +21,11 @@ # =================================================================== # ECOMP is a trademark and service mark of AT&T Intellectual Property. -echo "This is ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh" +echo "This is ${WORKSPACE}/scripts/vid/start_vid_containers.sh" export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` -cd ${WORKSPACE}/test/csit/tests/vid/resources +cd ${WORKSPACE}/tests/vid/resources docker-compose up -d --build # WAIT 5 minutes maximum and test every 5 seconds if VID up using HealthCheck API diff --git a/scripts/vvp/clone_and_setup_vvp_data.sh b/scripts/vvp/clone_and_setup_vvp_data.sh index a39ed083..866a82e6 100644 --- a/scripts/vvp/clone_and_setup_vvp_data.sh +++ b/scripts/vvp/clone_and_setup_vvp_data.sh @@ -22,7 +22,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/vvp/clone_and_setup_vvp_data.sh" +echo "This is ${WORKSPACE}/scripts/vvp/clone_and_setup_vvp_data.sh" # Clone vvp enviroment template mkdir -p ${WORKSPACE}/data/environments/ diff --git a/scripts/vvp/kill_containers_and_remove_dataFolders.sh b/scripts/vvp/kill_containers_and_remove_dataFolders.sh index a6c108eb..38bd3319 100644 --- a/scripts/vvp/kill_containers_and_remove_dataFolders.sh +++ b/scripts/vvp/kill_containers_and_remove_dataFolders.sh @@ -17,7 +17,7 @@ # Modifications copyright (c) 2017 AT&T Intellectual Property # -echo "This is ${WORKSPACE}/test/csit/scripts/vvp/kill_and_remove_dataFolder.sh" +echo "This is ${WORKSPACE}/scripts/vvp/kill_and_remove_dataFolder.sh" CONTAINER_NAME="vvp-engagementmgr" diff --git a/scripts/vvp/start_vvp_containers.sh b/scripts/vvp/start_vvp_containers.sh index 5f905b6a..cafc040c 100644 --- a/scripts/vvp/start_vvp_containers.sh +++ b/scripts/vvp/start_vvp_containers.sh @@ -22,7 +22,7 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # -echo "This is ${WORKSPACE}/test/csit/scripts/vvp/start_vvp_containers.sh" +echo "This is ${WORKSPACE}/scripts/vvp/start_vvp_containers.sh" export IP=$HOST_IP export PREFIX='nexus3.onap.org:10001/openecomp/vvp' |