X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=csit%2Frun-csit.sh;h=f291e341836c1c92d6a92da19617a27568ba8d8f;hb=46d6e4fddd4c2a955c685f006f76053205cfc4ec;hp=52ec2186305390e3e4aa2649be80f6c351fa95b3;hpb=87e0299bb0bfc688de6d82207477bca0bcc14850;p=cps.git diff --git a/csit/run-csit.sh b/csit/run-csit.sh index 52ec218630..f291e34183 100755 --- a/csit/run-csit.sh +++ b/csit/run-csit.sh @@ -20,6 +20,12 @@ # Branched from ccsdk/distribution to this repository Feb 23, 2021 +# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh +source_safely "${ROBOT3_VENV}/bin/activate" + +WORKDIR=$(mktemp -d --suffix=-robot-workdir) +cd "${WORKDIR}" + # # functions # @@ -154,14 +160,8 @@ TESTPLANDIR="${WORKSPACE}/${TESTPLAN}" # 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" - -WORKDIR=$(mktemp -d --suffix=-robot-workdir) -cd "${WORKDIR}" - # Add csit scripts to PATH -export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin" +export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin" export SCRIPTS="${WORKSPACE}/scripts" export ROBOT_VARIABLES=