X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=csit%2Frun-csit.sh;h=ba3fb9a9931684ef6e58e7956888f8ba04daf004;hb=7b2cf6d7ee07d31e51fc2fba478274c120739b3b;hp=31b8e29f055419f2b4cc28e5e3b3d1ce27887f26;hpb=f91533a9b7dc3c349a2a9a00c82faafd5de8b17e;p=sdnc%2Foam.git diff --git a/csit/run-csit.sh b/csit/run-csit.sh index 31b8e29f..ba3fb9a9 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,6 +209,7 @@ 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} fi