From 4e55eaa9da5852f2c3d3259efe23bccef6aa2bdf Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Mon, 22 Dec 2014 07:30:49 -0800 Subject: [PATCH] Basic build slave needs to be CentOS 6 OpenJDK 1.8.0 isn't available until EL 7.1 finally comes out. As such we need to keep using EL6 for now so that we can offer up Java8 to projects. Change-Id: I2cd94fb5b6281f826c4d70a806867af2f1af5dab Signed-off-by: Andrew Grimberg --- vagrant/basic-builder/Vagrantfile | 4 ++-- vagrant/basic-builder/bootstrap.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vagrant/basic-builder/Vagrantfile b/vagrant/basic-builder/Vagrantfile index a71c67abd..e9ea15751 100644 --- a/vagrant/basic-builder/Vagrantfile +++ b/vagrant/basic-builder/Vagrantfile @@ -34,12 +34,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # create these base builds always on the smallest system possible rs.flavor = 'general1-1' - # Default the CentOS 7 - Vagrant ready image unless overriden by a RSIMAGE + # Default the CentOS 6.5 - Vagrant ready image unless overriden by a RSIMAGE # environment variable if ENV['RSIMAGE'] rs.image = ENV['RSIMAGE'] else - rs.image = 'CentOS 7 - Vagrant ready' + rs.image = 'CentOS 6.5 - Vagrant ready' end end diff --git a/vagrant/basic-builder/bootstrap.sh b/vagrant/basic-builder/bootstrap.sh index f0293976d..ef8898e6d 100644 --- a/vagrant/basic-builder/bootstrap.sh +++ b/vagrant/basic-builder/bootstrap.sh @@ -40,5 +40,5 @@ yum install -q -y @development perl-{Digest-SHA,ExtUtils-MakeMaker} \ # 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 \ +yum install -q -y {jansson,libevent,libevent2,libnl,libuuid}-devel \ python-{devel,virtualenv,setuptools} -- 2.36.6