Move xmlstarlet and sshpass to vagrant definition

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

diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh
index ea7c7b583d44ec456bacc9670cec5224c7c762d7..dbb4942b7fbb4de2adf63c951baf66b9e0c663f5 100755 (executable)
--- a/jenkins-scripts/builder.sh
+++ b/jenkins-scripts/builder.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
 yum clean all
-yum install -y python-virtualenv xmlstarlet
-
-# sshpass for the current deploy test to be runable immediatelly after build
-yum install -y sshpass
 
 # add in mono components for VTN
 yum install -y yum-utils

diff --git a/vagrant/basic-builder/bootstrap.sh b/vagrant/basic-builder/bootstrap.sh
index db5f639028e17b56ce86af889f91a1749003da48..5d81e54dc3747224cf1b721779cb68ddcb3aff6d 100644 (file)
--- a/vagrant/basic-builder/bootstrap.sh
+++ b/vagrant/basic-builder/bootstrap.sh
@@ -13,6 +13,16 @@ yum install -q -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     ant {boost,gtest,json-c,libcurl,libxml2,libvirt,openssl}-devel \
     {readline,unixODBC}-devel yum-utils
 
+# Install python dependencies
+yum install -y python-{devel,virtualenv,setuptools,pip}
+
+# Needed by autorelease scripts
+yum install -y xmlstarlet
+
+# sshpass for the current deploy test to be runable immediatelly after
+# build
+yum install -y sshpass
+
 # tcpmd5 is wanting to do 32bit ARM cross-compilation and is specifically
 # requesting the following be installed (note the kernel headers are
 # going to be the x86_64 package as there aren't separate 32bit and
@@ -23,8 +33,7 @@ yum install -q -y glibc-devel.i686 kernel-headers
 # an EL6 system some of these packages are not availalble (or at the
 # wrong version) in publically available repositories as such this
 # should only really be done on an EL7 (or F18+) system
-yum install -q -y {jansson,libevent,libnl,libuuid}-devel \
-    python-{devel,virtualenv,setuptools,pip}
+yum install -q -y {jansson,libevent,libnl,libuuid}-devel
 
 #The following is needed for the new code in vtn project.
 #these packages will enable C# compilation.