NCMP-DMI: Modify CSIT script to have absolute root path env

        - change set up to call docker compose for cps-ncmp
        - add root as a property in 'test.properties'
        - root is specified to be root directory folder for the current
          project

Issue-ID: CPS-1472
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
Change-Id: I7648285ab55dd48a934535014953d6f887594742

diff --git a/csit/plans/dmi/setup.sh b/csit/plans/dmi/setup.sh
index 03d79c2..7008e29 100755 (executable)
--- a/csit/plans/dmi/setup.sh
+++ b/csit/plans/dmi/setup.sh
@@ -62,13 +62,9 @@ docker-compose version
 docker-compose up -d
 
 ####################### setup cps-ncmp ############################
-
-cd $WORKSPACE/archives
+cd $DMI_PLUGIN_HOME
 git clone "https://gerrit.onap.org/r/cps"
-mkdir -p $WORKSPACE/archives/dc-cps-ncmp
-cat $WORKSPACE/archives/cps/docker-compose/docker-compose.yml
-cp $WORKSPACE/archives/cps/docker-compose/*.yml $WORKSPACE/archives/dc-cps-ncmp
-cd $WORKSPACE/archives/dc-cps-ncmp
+cd $DMI_PLUGIN_HOME/cps/docker-compose
 docker-compose up -d
 
 ###################### setup sdnc #######################################

diff --git a/csit/plans/dmi/test.properties b/csit/plans/dmi/test.properties
index 88c3815..39e577a 100644 (file)
--- a/csit/plans/dmi/test.properties
+++ b/csit/plans/dmi/test.properties
@@ -22,4 +22,6 @@ DMI_SERVICE_URL=http://$LOCAL_IP:$DMI_PORT
 
 DOCKER_REPO=nexus3.onap.org:10003
 
-CPS_VERSION=latest
\ No newline at end of file
+CPS_VERSION=latest
+
+CPS_HOME=$DMI_PLUGIN_HOME/cps
\ No newline at end of file

diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index 3cbc278..70cc0d9 100755 (executable)
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -19,6 +19,7 @@
 # $1 test options (passed on to run-csit.sh as such)
 
 export TESTOPTIONS=${1}
+export DMI_PLUGIN_HOME=$(git rev-parse --show-toplevel)
 export WORKSPACE=$(git rev-parse --show-toplevel)/csit
 
 rm -rf ${WORKSPACE}/archives