-virtualenv $WORKSPACE/venv-robotframework
-source $WORKSPACE/venv-robotframework/bin/activate
-pip install -q docker-py importlib requests scapy
-pip install -q robotframework{,-{httplibrary,requests,sshlibrary}}
+ROBOT_VENV=`mktemp -d --suffix=robot_venv`
+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.
+virtualenv --system-site-packages ${ROBOT_VENV}
+source ${ROBOT_VENV}/bin/activate
+
+set -exu
+
+# Make sure pip itself us up-to-date.
+pip install --upgrade pip
+
+pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr
+pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
+
+# Module jsonpath is needed by current AAA idmlite suite.
+pip install --upgrade jsonpath-rw
+
+# Modules for longevity framework robot library
+pip install elasticsearch==1.7.0 elasticsearch-dsl==0.0.11
+
+# Print installed versions.
+pip freeze