X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=csit%2Frun-csit.sh;h=7021f0f9d44fd98e85231bfab7833e4c56ea1a9b;hb=HEAD;hp=31b8e29f055419f2b4cc28e5e3b3d1ce27887f26;hpb=a4a4c3111e505ea6026542737125497a69521fa8;p=sdnc%2Foam.git

diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index 31b8e29f..7021f0f9 100755
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -157,10 +157,8 @@ source_safely "${WORKSPACE}/sdnc-csit.env"
 if [[ -z $ROBOT_IMAGE ]]; then
   # Run installation of prerequired libraries
   source_safely "${WORKSPACE}/prepare-csit.sh"
-
-
-# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
-source_safely "${ROBOT_VENV}/bin/activate"
+  # Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
+  source_safely "${ROBOT_VENV}/bin/activate"
 fi
 
 WORKDIR=$(mktemp -d --suffix=-robot-workdir)
@@ -211,8 +209,9 @@ if [[ -z $SDNC_RELEASE_WITHOUT_ROBOT ]] ; then
         else
             echo "*** TRACE **** python is running in a container"
             docker run --rm --net="host" \
+            --env-file ${WORKSPACE}/sdnc-csit-robot.env \
             -v ${WORKSPACE}:${WORKSPACE} -v ${WORKDIR}:${WORKDIR} $ROBOT_IMAGE  \
-            python3 -B -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
+            python3 -B -m robot -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
         fi
     else
             echo "[INFO] Skip Robot test suite, because SDNC is not in ready state"
@@ -224,7 +223,7 @@ else
     echo "[WARNING] Dummy Robot test suite is executed, job remains ok. "
     docker run --rm --net="host" \
     -v ${WORKSPACE}:${WORKSPACE} -v ${WORKDIR}:${WORKDIR} $ROBOT_IMAGE  \
-    python3 -B -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${WORKSPACE}/tests/sdnr/debug/10_dummy.robot
+    python3 -B -m robot -N ${TESTPLAN} -v WORKSPACE:/tmp --outputdir ${WORKDIR} ${ROBOT_VARIABLES} ${TESTOPTIONS} ${WORKSPACE}/tests/sdnr/debug/10_dummy.robot
    true
 fi
 RESULT=$?