X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-install-robotframework.sh;h=692c886f11b432e25a4617ac4b03472985b179f6;hb=fe0f1a9064af608508bc55ee23de27b7a46b9955;hp=0a814db6cdfd883963dad933a38f35cd23265bb4;hpb=70ceace4eaa326b6ddf0af903a65e21987bf1d86;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index 0a814db6c..692c886f1 100644
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -10,20 +10,20 @@
 ##############################################################################
 # vim: sw=4 ts=4 sts=4 et ft=sh :
 
-ROBOT_VENV="/tmp/v/robot"
-echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
-
-# The --system-site-packages parameter allows us to pick up system level
-# installed packages. This allows us to bake matplotlib which takes very long
-# to install into the image.
-python3 -m venv "${ROBOT_VENV}"
 # shellcheck disable=SC1090
-source "${ROBOT_VENV}/bin/activate"
+. ~/lf-env.sh
 
-set -exu
+# Create a virtual environment for robot tests and make sure setuptools & wheel
+# are up-to-date in addition to pip
+lf-activate-venv --python python3 --venv-file "${WORKSPACE}/.robot_venv" \
+    setuptools \
+    wheel
+
+# Save the virtual environment in ROBOT_VENV
+ROBOT_VENV="$(cat "${WORKSPACE}/.robot_venv")"
+echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 
-# Make sure pip itself us up-to-date.
-python -m pip install --upgrade pip
+set -exu
 
 echo "Installing Python Requirements"
 cat << 'EOF' > "requirements.txt"
@@ -33,10 +33,11 @@ netaddr
 netifaces
 pyhocon
 requests
+robotframework
 robotframework-httplibrary
-robotframework-requests==0.7.2
+robotframework-requests==0.9.3
 robotframework-selenium2library
-robotframework-sshlibrary==3.1.1
+robotframework-sshlibrary==3.8.0
 scapy
 
 # Module jsonpath is needed by current AAA idmlite suite.
@@ -57,14 +58,7 @@ jmespath
 
 # Module for backup-restore support library
 jsonpatch
-
-# odltools for extra debugging
-odltools
 EOF
+
 python -m pip install -r requirements.txt
-# Todo: Workaround needs pinned version of odltool to the latest because of the
-# update in the dependency resolver in pip 21.3.
-# Ref: https://github.com/pypa/pip/issues/9215
-pip install odltools==0.1.34
-odltools -V
 pip freeze