Merge "Remove jjb custom scripting"

[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 f0ea3b049dc348a211b1d90c8f2ab990161f34c1..e8ca86e1bffc7271c1eadbb70a7fc91c4a153447 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -13,13 +13,27 @@
 ROBOT_VENV=`mktemp -d --suffix=robot_venv`
 echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
 
-virtualenv ${ROBOT_VENV}
+# 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
-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,selenium2library}}
-# jsonpath is needed by current AAA idmlite suite
-pip install -q --allow-external jsonpath --allow-unverified jsonpath jsonpath
+
+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
 
 # vim: sw=4 ts=4 sts=4 et ft=sh :