From a80dad0de0d632bdb4b0dec2200a5771ddec6ca3 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 7 Jul 2016 17:50:30 +0200 Subject: [PATCH] Vagrantfile: centos6: no FUSE, don't build binary Trying to install llfuse breaks borg installation (lots of compiler errors). Also, we're building the binaries on Debian wheezy since a while, no need to build them on centos6. Esp. since the Centos6 based binaries showed strange slowness in the past. --- Vagrantfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index e97289306..fc5fdacf8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -321,9 +321,7 @@ Vagrant.configure(2) do |config| b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("centos6_32") b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("centos6_32") b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("centos6_32") - b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("centos6_32") - b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller("centos6_32") - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("centos6_32") + b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg_no_fuse("centos6_32") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("centos6_32") end @@ -336,9 +334,7 @@ Vagrant.configure(2) do |config| b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("centos6_64") b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("centos6_64") b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("centos6_64") - b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("centos6_64") - b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller("centos6_64") - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("centos6_64") + b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg_no_fuse("centos6_64") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("centos6_64") end