Merge pull request #4417 from craigcomstock/vagrant-ci-centos-7

Upgraded contrib-vagrant to centos-7

.gitignore

@@ -43,7 +43,7 @@ stamp-h1
 /cf-serverd/Makefile
 /cf-testd/Makefile
 /cf-upgrade/Makefile
-/contrib/vagrant-ci/centos-6-x64/Makefile
+/contrib/vagrant-ci/centos-7-x64/Makefile
 /examples/Makefile
 /ext/Makefile
 /libcfnet/Makefile
@@ -147,7 +147,7 @@ cscope.*
 \#*#
 .dir-locals.el
 /contrib/*.elc
-/contrib/vagrant-ci/centos-6-x64/.vagrant
+/contrib/vagrant-ci/centos-7-x64/.vagrant
 
 # eclipse
 .cproject
@@ -179,4 +179,4 @@ __pycache__
 # SELinux policy build artifacts
 misc/selinux/cfengine-enterprise.pp
 misc/selinux/cfengine-enterprise.if
-misc/selinux/tmp
+misc/selinux/tmp

Makefile.am

@@ -48,7 +48,7 @@ SUBDIRS = \
 	ext \
 	examples \
 	tests \
-	contrib/vagrant-ci/centos-6-x64
+	contrib/vagrant-ci/centos-7-x64
 
 
 # Hide the buildsystem's username, at least with GNU tar.
@@ -156,13 +156,13 @@ cf__v_SED_0 = @echo "  SED     " "$@";
 cf__v_SED_1 =
 
 vm-check:
-	$(MAKE) -C contrib/vagrant-ci/centos-6-x64/ vm-check
+	$(MAKE) -C contrib/vagrant-ci/centos-7-x64/ vm-check
 
 vm-check-full:
-	$(MAKE) -C contrib/vagrant-ci/centos-6-x64/ vm-check-full
+	$(MAKE) -C contrib/vagrant-ci/centos-7-x64/ vm-check-full
 
 destroy-vms:
-	$(MAKE) -C contrib/vagrant-ci/centos-6-x64/ destroy-vms
+	$(MAKE) -C contrib/vagrant-ci/centos-7-x64/ destroy-vms
 
 static-check:
 	tests/static-check/run.sh

configure.ac

@@ -1807,7 +1807,7 @@ AC_CONFIG_FILES([Makefile
     cf-net/Makefile
     cf-secret/Makefile
     config.post.h
-    contrib/vagrant-ci/centos-6-x64/Makefile
+    contrib/vagrant-ci/centos-7-x64/Makefile
     misc/Makefile
     misc/selinux/Makefile
     ext/Makefile

contrib/vagrant-ci/centos-6-x64/Vagrantfile → contrib/vagrant-ci/centos-7-x64/Vagrantfile

@@ -20,7 +20,7 @@ Vagrant.configure("2") do |config|
   config.vm.synced_folder "../../../", "/cfe/core", type: "rsync",
                           rsync__args: ["--archive", "--links", "--delete"]
 
-  config.vm.box = "centos/6"
+  config.vm.box = "centos/7"
   config.vm.provider :libvirt do |lv|
     lv.cpus = os_cpu_cores
     lv.memory = 1024
@@ -70,8 +70,10 @@ SHELL
                           rsync__args: ["--archive", "--links", "--delete"]
 
     fd.vm.provision "shell", inline: <<-SHELL
-yum -q -y install http://opensource.wandisco.com/centos/6/git/x86_64/wandisco-git-release-6-1.noarch.rpm || true
+yum -q -y install http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-1.noarch.rpm || true
 yum -q -y install 'perl(ExtUtils::MakeMaker)' 'perl(Digest::MD5)' 'perl(Module::Load::Conditional)' ncurses-devel rpm-build
+yum -q -y install psmisc # for fuser command
+yum -q -y install wget
 SHELL
 
     fd.vm.provision "shell", inline: <<-SHELL
@@ -83,7 +85,7 @@ export NO_CONFIGURE=1
 export PROJECT=community
 cd /cfe
 ./buildscripts/build-scripts/autogen
-yum -q -y remove libtool
+yum -q -y remove libtool libtool-ltdl
 ./buildscripts/build-scripts/clean-buildmachine
 ./buildscripts/build-scripts/build-environment-check
 ./buildscripts/build-scripts/install-dependencies