From 605bec25914adb79403bb43947aa3eb1bfb36fc4 Mon Sep 17 00:00:00 2001 From: emaclee Date: Thu, 2 Feb 2023 10:58:35 +0000 Subject: 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 - modified docker compose init container to use ROOT env var Issue-ID: CPS-1472 Signed-off-by: emaclee Change-Id: Ie5ac6bbff7cb1e761501bd0db8447f86af06b95f --- csit/plans/cps/setup.sh | 4 +--- csit/plans/cps/test.properties | 2 ++ csit/run-project-csit.sh | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'csit') 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 -- cgit 1.2.3-korg