diff options
| author |   Taka Cho <takamune.cho@att.com> | 2021-01-15 11:20:06 -0500 |
|---|---|---|
| committer | Takamune Cho <takamune.cho@att.com> | 2021-01-15 19:21:01 +0000 |
| commit | 78bbba719bde5ea12d04266c92e7c55dcd6d9946 (patch) | |
| tree | 079450947c3d51a7bc38e9f00390a9d37141474d | |
| parent | 6d188afbef71b620063d5d4c1687a30c8f54ee8e (diff) | |
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>
| -rwxr-xr-x | csit/run-project-csit.sh (renamed from csit/run-policy-csit.sh) | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/csit/run-policy-csit.sh b/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" |