diff options
| -rwxr-xr-x | csit/plans/cps/setup.sh | 4 | ||||
| -rw-r--r-- | csit/plans/cps/test.properties | 2 | ||||
| -rwxr-xr-x | csit/run-project-csit.sh | 1 | ||||
| -rw-r--r-- | docker-compose/docker-compose.yml | 5 |
4 files changed, 6 insertions, 6 deletions
diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh index 43575f9446..c715da142f 100755 --- a/csit/plans/cps/setup.sh +++ b/csit/plans/cps/setup.sh @@ -57,9 +57,7 @@ source $WORKSPACE/plans/cps/test.properties export $(cut -d= -f1 $WORKSPACE/plans/cps/test.properties) ###################### setup cps-ncmp ############################ -mkdir -p $WORKSPACE/archives/dc-cps -cp $WORKSPACE/../docker-compose/*.yml $WORKSPACE/archives/dc-cps -cd $WORKSPACE/archives/dc-cps +cd $CPS_HOME/docker-compose curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties index 9e22362121..6a715f75df 100644 --- a/csit/plans/cps/test.properties +++ b/csit/plans/cps/test.properties @@ -27,3 +27,5 @@ DMI_VERSION=1.3.0-SNAPSHOT-latest ADVISED_MODULES_SYNC_SLEEP_TIME_MS=2000 CMHANDLE_DATA_SYNC_SLEEP_TIME_MS=2000 + +CPS_HOME=$CPS_HOME
\ No newline at end of file diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh index a231c5e160..fcb3c925c1 100755 --- a/csit/run-project-csit.sh +++ b/csit/run-project-csit.sh @@ -21,6 +21,7 @@ # $1 test options (passed on to run-csit.sh as such) export TESTOPTIONS=${1} +export CPS_HOME=$(git rev-parse --show-toplevel) export WORKSPACE=$(git rev-parse --show-toplevel)/csit rm -rf ${WORKSPACE}/archives diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 7d6379ac2f..dd7749ac58 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -110,13 +110,12 @@ services: restart: unless-stopped init-db: - build: ../../../docker-compose/initfile + build: ${CPS_HOME:-.}/docker-compose/initfile environment: CPS_CORE_PORT: ${CPS_CORE_PORT:-8883} CPS_CORE_MANAGEMENT_PORT: ${CPS_CORE_MANAGEMENT_PORT:-8887} volumes: - - ./initfile:/initfile - - ../../../cps-ncmp-service/src/main/resources/model/:/model + - ${CPS_HOME:-.}/cps-ncmp-service/src/main/resources/model/:/model depends_on: cps-and-ncmp: condition: service_started |