summaryrefslogtreecommitdiffstats
path: root/csit/run-csit.sh
diff options
context:
space:
mode:
Diffstat (limited to 'csit/run-csit.sh')
-rwxr-xr-xcsit/run-csit.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index 52ec21863..aefcc8539 100755
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -20,6 +20,11 @@
# 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)
+
#
# functions
#
@@ -154,14 +159,11 @@ 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)
+# Use robot framework working directory
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=