diff options
| -rwxr-xr-x | csit/plans/dmi/setup.sh | 8 | ||||
| -rw-r--r-- | csit/plans/dmi/test.properties | 4 | ||||
| -rwxr-xr-x | csit/run-project-csit.sh | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/csit/plans/dmi/setup.sh b/csit/plans/dmi/setup.sh index 03d79c2b..7008e29b 100755 --- 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 88c3815a..39e577ae 100644 --- 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 3cbc278d..70cc0d9b 100755 --- 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 |