From: Taka Cho <takamune.cho@att.com>
Date: Fri, 15 Jan 2021 16:20:06 +0000 (-0500)
Subject: rename to run-project-csit.sh to fit new JJB template
X-Git-Tag: 2.2.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F116917%2F4;p=policy%2Fdocker.git

rename to run-project-csit.sh to fit new JJB template

the project-csit jjb template is using
run-project-csit.sh by default.
also change SCRIPTS env to fit the right path
for jenkins build.

Issue-ID: POLICY-2895
Change-Id: Iec622cde4d65470ce966589082c086e6f668cb66
Signed-off-by: Taka Cho <takamune.cho@att.com>
---

diff --git a/csit/run-policy-csit.sh b/csit/run-project-csit.sh
similarity index 95%
rename from csit/run-policy-csit.sh
rename to csit/run-project-csit.sh
index 2a62e1c0..5927b2b6 100755
--- a/csit/run-policy-csit.sh
+++ b/csit/run-project-csit.sh
@@ -137,8 +137,8 @@ if [ -z "$WORKSPACE" ]; then
 fi
 
 # Add csit scripts to PATH
-export PATH="${PATH}:${WORKSPACE}/docker/csit:${WORKSPACE}/scripts:${ROBOT_VENV}/bin"
-export SCRIPTS="${WORKSPACE}/docker/csit"
+export PATH="${PATH}:${WORKSPACE}/csit:${WORKSPACE}/scripts:${ROBOT_VENV}/bin"
+export SCRIPTS="${WORKSPACE}/csit"
 export ROBOT_VARIABLES=
 
 # get the plan from git clone
@@ -155,9 +155,6 @@ if ! `git clone -b ${GERRIT_BRANCH} --single-branch git://gerrit-mirror-ap.onap.
     exit 1
 fi
 
-# temp fix
-cp -rf /root/${PROJECT}/csit ${WORKSPACE}/${PROJECT}
-
 if [ -f "${WORKSPACE}/${1}/csit/plans/testplan.txt" ]; then
     export TESTPLAN="${1}"
 else
@@ -205,7 +202,7 @@ SUITES=$( xargs -a testplan.txt )
 echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
 echo "Starting Robot test suites ${SUITES} ..."
 relax_set
-python -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
+python -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${SUITES}
 RESULT=$?
 load_set
 echo "RESULT: $RESULT"