Move xmlstarlet and sshpass to vagrant definition

[releng/builder.git] / vagrant / basic-builder / bootstrap.sh

diff --git a/vagrant/basic-builder/bootstrap.sh b/vagrant/basic-builder/bootstrap.sh
index 24aed3c7b54cfa8de03aafce71afe7037d08a3e0..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,15 +33,14 @@ 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.
 rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
 #Added the mono tools repository
-yum-config-manager -q -y --add-repo http://download.mono-project.com/repo/centos6
+yum-config-manager -q -y --add-repo http://origin-download.mono-project.com/repo/centos6/
 #Install the nuget binary
-yum install -q -y http://download.mono-project.com/repo/centos/RPMS/noarch/nuget-2.8.3+md58+dhx1-0.noarch.rpm
+yum install -q -y http://origin-download.mono-project.com/repo/centos/n/nuget/nuget-2.8.3+md58+dhx1-0.noarch.rpm
 #install the mono toolchain
 yum -q -y install mono-complete