Move robot dependencies into packer provision script

Install robot dependencies during image provisioning to make the spinup
scripts portion run faster.

Change-Id: I6dd06ff5a044f3fc82d7fa55a1aeafbea0b9478f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
index 064af6e5cfa84647a5d383ee1c5203ccec9ebef7..ecb371cf38610cbb6ec0e81af310e07b04aab642 100755 (executable)
--- a/jenkins-scripts/robot.sh
+++ b/jenkins-scripts/robot.sh
@@ -7,23 +7,12 @@ jenkins     ALL = NOPASSWD: /usr/bin/sshuttle, /usr/bin/kill, /usr/sbin/iptables
 EOF
 
 yum clean all
-yum install -y -q unzip python-netaddr sshuttle @development
-yum remove -y robotframework-{sshlibrary,requests}
+yum install -y -q python-netaddr
 
-# These development packages are needed for successful installation of robotframework-sshlibrary (done elsewhere)
-yum install -y -q libffi-devel openssl-devel
-
-## Install netcat & docker-py
-yum install -y -q nc python-docker-py
-
-# Install dependencies for matplotlib library used in longevity framework
-yum install -y yum-utils
-yum-builddep -y python-matplotlib
+## Install docker-py
+yum install -y -q python-docker-py
 
 # make sure the firewall is stopped
 service iptables stop
 
-# install crudini command line tool for editing config files
-yum install -y crudini
-
 # vim: sw=2 ts=2 sts=2 et :

diff --git a/packer/provision/robot.sh b/packer/provision/robot.sh
index 90b4e068e91773e517b87bb037f3c7be33e7a0eb..441b0104784eb9a9e07f920d9c4f4c9f44e74e11 100644 (file)
--- a/packer/provision/robot.sh
+++ b/packer/provision/robot.sh
@@ -5,10 +5,20 @@
 # Install minimal python requirements to get virtualenv going
 # Additional python dependencies should be installed via JJB configuration
 # inside project jobs using a virtualenv setup.
-yum install -q -y python-{devel,setuptools,virtualenv}
+yum install -q -y python-{devel,setuptools,virtualenv} @development
+
+# Install dependencies for robotframework and robotframework-sshlibrary
+# installed elsewhere
+yum install -y -q yum-utils unzip sshuttle nc libffi-devel openssl-devel
+
+# Install dependencies for matplotlib library used in longevity framework
+yum-builddep -y python-matplotlib
+
+# install crudini command line tool for editing config files
+yum install -y -q crudini
 
 # Install `udpreplay` to be used for (lispflowmapping) performance tests
-yum install -q -y @development libpcap-devel boost-devel
+yum install -q -y libpcap-devel boost-devel
 git clone -q https://github.com/ska-sa/udpreplay.git
 cd udpreplay
 make &> /dev/null && cp udpreplay /usr/local/bin