Merge "Support any number of controller and mininet instances"

[releng/builder.git] / jjb / integration / include-raw-integration-install-robotframework.sh

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 9692cdc3316faf1502f67b2c0b5fecd40feee740..78cae49c5a714d7711ddc4b11d11f54867f91dc0 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -10,9 +10,16 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-virtualenv $WORKSPACE/venv-robotframework
-source $WORKSPACE/venv-robotframework/bin/activate
-pip install -q docker-py importlib requests scapy
+ROBOT_VENV=`mktemp -d --suffix=robot_venv`
+echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
+
+virtualenv ${ROBOT_VENV}
+source ${ROBOT_VENV}/bin/activate
+pip install -q --upgrade pip
+pip --version
+pip install -q docker-py importlib requests scapy netifaces netaddr ipaddr
 pip install -q robotframework{,-{httplibrary,requests,sshlibrary}}
+# jsonpath is needed by current AAA idmlite suite
+pip install -q --allow-external jsonpath --allow-unverified jsonpath jsonpath
 
 # vim: sw=4 ts=4 sts=4 et ft=sh :