summaryrefslogtreecommitdiffstats
path: root/csit
diff options
context:
space:
mode:
authorMatthew Watkins <mwatkins@linuxfoundation.org>2022-11-17 14:55:28 -0800
committerMatthew Watkins <mwatkins@linuxfoundation.org>2022-11-17 14:58:43 -0800
commit46d6e4fddd4c2a955c685f006f76053205cfc4ec (patch)
tree1ed65151466727417b03405ce194a18c8187f940 /csit
parent87e0299bb0bfc688de6d82207477bca0bcc14850 (diff)
Fix: Swap run-csit.sh to Python3 robot framework
Issue-ID: RELENG-4523 Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org> Change-Id: I15ad8a147a669c503ea023f79cef101baf99c21f
Diffstat (limited to 'csit')
-rwxr-xr-xcsit/run-csit.sh14
1 files changed, 7 insertions, 7 deletions
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=