From 52db504a068a8bef7ef24484462b65c3f0c42456 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 15 Feb 2016 15:16:26 -0500 Subject: [PATCH] Move xmlstarlet and sshpass to vagrant definition Change-Id: If91d5f1568930f509b2d4d2d3c691186bbd3bef9 Signed-off-by: Thanh Ha --- jenkins-scripts/builder.sh | 4 ---- vagrant/basic-builder/bootstrap.sh | 13 +++++++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh index ea7c7b583..dbb4942b7 100755 --- 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 db5f63902..5d81e54dc 100644 --- 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. -- 2.36.6