X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vagrant%2Fbasic-builder%2Fbootstrap.sh;h=5d81e54dc3747224cf1b721779cb68ddcb3aff6d;hb=52db504a068a8bef7ef24484462b65c3f0c42456;hp=c3a2eef2bf8dfc4805af1572147960e74f976239;hpb=3756d2d54962cee88910a6a19beaf0108b6d3697;p=releng%2Fbuilder.git

diff --git a/vagrant/basic-builder/bootstrap.sh b/vagrant/basic-builder/bootstrap.sh
index c3a2eef2b..5d81e54dc 100644
--- a/vagrant/basic-builder/bootstrap.sh
+++ b/vagrant/basic-builder/bootstrap.sh
@@ -3,38 +3,25 @@
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
 yum clean all
-# Add the ODL yum repo (not needed for java nodes, but useful for
-# potential later layers)
-yum install -q -y https://nexus.opendaylight.org/content/repositories/opendaylight-yum-epel-6-x86_64/rpm/opendaylight-release/0.1.0-1.el6.noarch/opendaylight-release-0.1.0-1.el6.noarch.rpm
 
 # Make sure the system is fully up to date
 yum update -q -y
 
-# Add in git (needed for most everything) and XML-XPath as it is useful
-# for doing CLI based CML parsing of POM files
-yum install -q -y git perl-XML-XPath
-
-# install all available openjdk-devel sets
-yum install -q -y 'java-*-openjdk-devel'
-
-# we currently use Java7 (aka java-1.7.0-openjdk) as our standard make
-# sure that this is the java that alternatives is pointing to, dynamic
-# spin-up scripts can switch to any of the current JREs installed if
-# needed
-alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
-alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
-
 # The following packages are not needed by all projects, but they are
 # needed by enough to make them useful everywhere
 yum install -q -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \
     ant {boost,gtest,json-c,libcurl,libxml2,libvirt,openssl}-devel \
-    {readline,unixODBC}-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
@@ -46,17 +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,libevent2,libnl,libuuid}-devel \
-    python-{devel,virtualenv,setuptools}
+yum install -q -y {jansson,libevent,libnl,libuuid}-devel
 
-#get yum-config-manager
-yum -q -y install yum-utils
 #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