From: kaihlavi <l.kaihlavirt@partner.samsung.com>
Date: Fri, 28 Jun 2019 06:12:07 +0000 (+0300)
Subject: Update directory to new scripts/sdc-dcae-d
X-Git-Tag: 6.0.0-ONAP~233^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F90645%2F1;p=integration%2Fcsit.git

Update directory to new scripts/sdc-dcae-d

 - copy docker run scripts to and execute them under
   the new scripts/sdc-dcae-d instead of scripts/sdc
 - update info outputs

Change-Id: Ie07f91d5e8c4a1ef4e14025fa8bd3cdaeb454b3b
Issue-ID: SDC-2365
Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com>
---

diff --git a/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh b/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh
index 35cbc7be..9a9350da 100644
--- a/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh
+++ b/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh
@@ -24,7 +24,7 @@
 # directories in the future
 #
 
-echo "This is ${WORKSPACE}/scripts/sdc/cleanup_sdc_dcaed.sh"
+echo "This is ${WORKSPACE}/scripts/sdc-dcae-d/cleanup_sdc_dcaed.sh"
 
 cp -rf ${WORKSPACE}/data/logs/ ${WORKSPACE}/archives/
 
diff --git a/scripts/sdc-dcae-d/setup_sdc_dcaed.sh b/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
index e0d0cc28..0bfc7e01 100644
--- a/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
+++ b/scripts/sdc-dcae-d/setup_sdc_dcaed.sh
@@ -17,7 +17,7 @@
 
 set -x
 
-echo "This is ${WORKSPACE}/scripts/sdc/setup_sdc_dcaed.sh"
+echo "This is ${WORKSPACE}/scripts/sdc-dcae-d/setup_sdc_dcaed.sh"
 
 # Clone sdc enviroment template
 mkdir -p ${WORKSPACE}/data/environments/
@@ -48,10 +48,10 @@ source ${WORKSPACE}/data/clone/dt-be-main/version.properties
 export DCAE_RELEASE=$major.$minor-STAGING-latest
 export DEP_ENV=$ENV_NAME
 
-cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/
-cp ${WORKSPACE}/data/clone/dt-be-main/docker/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/dcaed_docker_run.sh
+cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc-dcae-d/
+cp ${WORKSPACE}/data/clone/dt-be-main/docker/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc-dcae-d/dcaed_docker_run.sh
 
-${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001
-${WORKSPACE}/scripts/sdc/dcaed_docker_run.sh -r ${DCAE_RELEASE} -e ${ENV_NAME} -p 10001
+${WORKSPACE}/scripts/sdc-dcae-d/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001
+${WORKSPACE}/scripts/sdc-dcae-d/dcaed_docker_run.sh -r ${DCAE_RELEASE} -e ${ENV_NAME} -p 10001