Updated Vagrant test setup

7 files changed, 15 insertions, 20 deletions

diff --git a/vagrant/debian10/Vagrantfile b/vagrant/debian10/Vagrantfile
index f42dbab..62104c4 100644
--- a/vagrant/debian10/Vagrantfile
+++ b/vagrant/debian10/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "roboxes/debian10"
+  config.vm.box = "boxen/debian-10"
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder "../../", "/bindfs",
@@ -21,7 +21,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", reboot: true, inline: <<-SHELL
     export DEBIAN_FRONTEND='noninteractive'
     apt-get update
-    apt-get install -y fuse3 libfuse3-dev build-essential pkg-config ruby valgrind
+    apt-get install -y fuse3 libfuse3-dev build-essential automake autoconf libtool pkg-config ruby valgrind
     apt-get clean
     echo user_allow_other > /etc/fuse.conf
   SHELL
diff --git a/vagrant/debian11/Vagrantfile b/vagrant/debian11/Vagrantfile
index 61c3298..c179c53 100644
--- a/vagrant/debian11/Vagrantfile
+++ b/vagrant/debian11/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "roboxes/debian11"
+  config.vm.box = "boxen/debian-11"
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder "../../", "/bindfs",
@@ -21,7 +21,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", reboot: true, inline: <<-SHELL
     export DEBIAN_FRONTEND='noninteractive'
     apt-get update
-    apt-get install -y fuse3 libfuse3-dev build-essential pkg-config ruby valgrind
+    apt-get install -y fuse3 libfuse3-dev build-essential automake autoconf libtool pkg-config ruby valgrind
     apt-get clean
     echo user_allow_other > /etc/fuse.conf
   SHELL
diff --git a/vagrant/centos8/Vagrantfile b/vagrant/rockylinux9/Vagrantfile
index 1793dd6..e59d100 100644
--- a/vagrant/centos8/Vagrantfile
+++ b/vagrant/rockylinux9/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "roboxes/centos8"
+  config.vm.box = "boxen/rockylinux-9"
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder "../../", "/bindfs",
@@ -12,19 +12,14 @@ Vagrant.configure("2") do |config|
     rsync__args: ["-av", "--delete-after"]
 
   config.vm.provider "virtualbox" do |v|
-    v.name = "bindfs-centos8"
+    v.name = "bindfs-rockylinux9"
   end
   config.vm.provider "libvirt" do |v|
     v.driver = if File.exist?('/dev/kvm') then 'kvm' else 'qemu' end
   end
 
   config.vm.provision "shell", inline: <<-SHELL
-    # CentOS 8 is EOL
-    # https://www.cyberithub.com/solved-failed-to-download-metadata-for-repo-appstream/
-    sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-    sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
-
-    yum install -y fuse fuse-devel gcc make pkg-config ruby valgrind
+    yum install -y fuse3 fuse3-devel gcc make automake autoconf libtool pkg-config ruby valgrind
     echo user_allow_other > /etc/fuse.conf
   SHELL
 end
diff --git a/vagrant/test.rb b/vagrant/test.rb
index e7a08f6..5d6f43f 100755
--- a/vagrant/test.rb
+++ b/vagrant/test.rb
@@ -86,7 +86,7 @@ threads = dirs.map do |dir|
         unless run_and_log.call "vagrant rsync"
           raise "vagrant rsync failed"
         end
-        unless run_and_log.call "vagrant ssh -c 'cd /bindfs && sudo rm -Rf tests/tmp_test_bindfs && ./configure && make distclean && ./configure && make && make check && sudo make check'"
+        unless run_and_log.call "vagrant ssh -c 'cd /bindfs && sudo rm -Rf tests/tmp_test_bindfs && ./autogen.sh && ./configure && make distclean && ./configure && make && make check && sudo make check'"
           mutex.synchronize do
             errors << "VM #{dir} tests failed."
           end
diff --git a/vagrant/ubuntu2004/Vagrantfile b/vagrant/ubuntu2004/Vagrantfile
index c37e5be..48a94d7 100644
--- a/vagrant/ubuntu2004/Vagrantfile
+++ b/vagrant/ubuntu2004/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "roboxes/ubuntu2004"
+  config.vm.box = "boxen/ubuntu-20.04"
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder "../../", "/bindfs",
@@ -20,7 +20,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
-    apt-get install -y fuse libfuse-dev build-essential pkg-config ruby valgrind
+    apt-get install -y fuse libfuse-dev build-essential automake autoconf libtool pkg-config ruby valgrind
     apt-get clean
     adduser vagrant fuse
     echo user_allow_other > /etc/fuse.conf
diff --git a/vagrant/ubuntu2204/Vagrantfile b/vagrant/ubuntu2204/Vagrantfile
index 06be5fd..7d30cd8 100644
--- a/vagrant/ubuntu2204/Vagrantfile
+++ b/vagrant/ubuntu2204/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "roboxes/ubuntu2204"
+  config.vm.box = "boxen/ubuntu-22.04"
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder "../../", "/bindfs",
@@ -20,7 +20,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
-    apt-get install -y fuse libfuse-dev build-essential pkg-config ruby valgrind
+    apt-get install -y fuse libfuse-dev build-essential automake autoconf libtool pkg-config ruby valgrind
     apt-get clean
     adduser vagrant fuse
     echo user_allow_other > /etc/fuse.conf
diff --git a/vagrant/ubuntu1804/Vagrantfile b/vagrant/ubuntu2404/Vagrantfile
index 6626a1c..23ae419 100644
--- a/vagrant/ubuntu1804/Vagrantfile
+++ b/vagrant/ubuntu2404/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "roboxes/ubuntu1804"
+  config.vm.box = "boxen/ubuntu-24.04"
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder "../../", "/bindfs",
@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
     rsync__args: ["-av", "--delete-after"]
 
   config.vm.provider "virtualbox" do |v|
-    v.name = "bindfs-ubuntu1804"
+    v.name = "bindfs-ubuntu2404"
   end
   config.vm.provider "libvirt" do |v|
     v.driver = if File.exist?('/dev/kvm') then 'kvm' else 'qemu' end
@@ -20,7 +20,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
-    apt-get install -y fuse libfuse-dev build-essential pkg-config ruby valgrind
+    apt-get install -y fuse3 libfuse3-dev build-essential automake autoconf libtool pkg-config ruby valgrind
     apt-get clean
     adduser vagrant fuse
     echo user_allow_other > /etc/fuse.conf