aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/tests.yml (renamed from .github/workflows/linux.yml)66
-rw-r--r--vagrant/centos8/Vagrantfile5
-rw-r--r--vagrant/debian10/Vagrantfile3
-rw-r--r--vagrant/debian11/Vagrantfile3
-rw-r--r--vagrant/freebsd12/Vagrantfile3
-rwxr-xr-xvagrant/test.rb12
-rw-r--r--vagrant/ubuntu1804/Vagrantfile (renamed from vagrant/bionic64/Vagrantfile)7
-rw-r--r--vagrant/ubuntu2004/Vagrantfile (renamed from vagrant/xenial64/Vagrantfile)7
-rw-r--r--vagrant/ubuntu2204/Vagrantfile28
9 files changed, 126 insertions, 8 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/tests.yml
index 71e0759..d31deeb 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/tests.yml
@@ -1,7 +1,7 @@
# Copyright (c) 2023 Sebastian Pipping <sebastian@pipping.org>
# Licensed under GPL v2 or later
-name: Build on Linux
+name: Build and test
on:
pull_request:
@@ -104,3 +104,67 @@ jobs:
set -x -o pipefail
make install DESTDIR="${PWD}"/ROOT/
find ROOT/ | sort | xargs ls -ld
+
+ vagrant:
+ name: Run Vagrant tests
+ runs-on: ubuntu-22.04
+ strategy:
+ fail-fast: false
+ matrix:
+ # TODO: automatically check that this list is up-to-date
+ box:
+ - centos8
+ - debian10
+ - debian11
+ #- freebsd12 # https://github.com/mpartel/bindfs/issues/144#issuecomment-1807258383
+ - ubuntu1804
+ - ubuntu2004
+ - ubuntu2204
+ steps:
+ - name: Install dependencies
+ run: |-
+ set -x
+ for FILE in /etc/apt/sources.list /etc/apt/sources.list.d/*; do
+ if [[ -e "${FILE}" ]]; then
+ sudo sed -i 's/# deb-src /deb-src /' "${FILE}"
+ fi
+ done
+
+ # The following is based on these instructions:
+ # https://developer.hashicorp.com/vagrant/install?product_intent=vagrant
+ # https://vagrant-libvirt.github.io/vagrant-libvirt/installation.html
+
+ wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+ echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+ sudo apt-get update
+ sudo apt-get build-dep vagrant ruby-libvirt
+ sudo apt-get install -y vagrant \
+ qemu-system-x86 \
+ autoconf automake libtool pkg-config \
+ qemu libvirt-daemon-system ebtables libguestfs-tools \
+ libxslt-dev libxml2-dev zlib1g-dev ruby-dev
+ vagrant plugin install vagrant-libvirt
+ sudo adduser "${USER}" libvirt
+
+ - name: Checkout Git branch
+ uses: actions/checkout@v4
+
+ - name: 'Generate build files with ./autogen.sh'
+ run: |-
+ ./autogen.sh
+
+ - name: Check for KVM
+ run: |-
+ if [[ -e /dev/kvm ]]; then
+ echo "This GitHub Action runner has KVM. This run will be fast."
+ else
+ echo "This GitHub Action runner does NOT have KVM. This run will be slow."
+ fi
+
+ - name: Test with Vagrant box ${{ matrix.box }}
+ env:
+ VAGRANT_DEFAULT_PROVIDER: libvirt
+ run: |-
+ # sudo needed because the current shell is not yet in group "libvirt"
+ # https://github.com/actions/runner-images/discussions/5981
+ sudo -E -s -u "${USER}" vagrant/test.rb --print-logs ${{ matrix.box }}
diff --git a/vagrant/centos8/Vagrantfile b/vagrant/centos8/Vagrantfile
index af2cba8..1793dd6 100644
--- a/vagrant/centos8/Vagrantfile
+++ b/vagrant/centos8/Vagrantfile
@@ -2,7 +2,7 @@
# vi: set ft=ruby :
Vagrant.configure("2") do |config|
- config.vm.box = "centos/8"
+ config.vm.box = "roboxes/centos8"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "../../", "/bindfs",
@@ -14,6 +14,9 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.name = "bindfs-centos8"
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
diff --git a/vagrant/debian10/Vagrantfile b/vagrant/debian10/Vagrantfile
index d56a8f2..f42dbab 100644
--- a/vagrant/debian10/Vagrantfile
+++ b/vagrant/debian10/Vagrantfile
@@ -14,6 +14,9 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.name = "bindfs-debian10"
end
+ config.vm.provider "libvirt" do |v|
+ v.driver = if File.exist?('/dev/kvm') then 'kvm' else 'qemu' end
+ end
config.vm.provision "shell", reboot: true, inline: <<-SHELL
export DEBIAN_FRONTEND='noninteractive'
diff --git a/vagrant/debian11/Vagrantfile b/vagrant/debian11/Vagrantfile
index 138da49..61c3298 100644
--- a/vagrant/debian11/Vagrantfile
+++ b/vagrant/debian11/Vagrantfile
@@ -14,6 +14,9 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.name = "bindfs-debian11"
end
+ config.vm.provider "libvirt" do |v|
+ v.driver = if File.exist?('/dev/kvm') then 'kvm' else 'qemu' end
+ end
config.vm.provision "shell", reboot: true, inline: <<-SHELL
export DEBIAN_FRONTEND='noninteractive'
diff --git a/vagrant/freebsd12/Vagrantfile b/vagrant/freebsd12/Vagrantfile
index 213c18c..d48bc11 100644
--- a/vagrant/freebsd12/Vagrantfile
+++ b/vagrant/freebsd12/Vagrantfile
@@ -14,6 +14,9 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.name = "bindfs-freebsd12"
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
pkg update
diff --git a/vagrant/test.rb b/vagrant/test.rb
index de4ffcc..e7a08f6 100755
--- a/vagrant/test.rb
+++ b/vagrant/test.rb
@@ -6,6 +6,7 @@ Usage: test.rb [--nohalt] [vm1 [...]]
Options:
-h --help Print this and exit.
--nohalt Don't halt VMs when done.
+ --print-logs Prints each VM's logs when it completes.
If VM names are given, only those are tested.
@@ -19,6 +20,7 @@ require 'fileutils'
Dir.chdir(File.dirname(__FILE__))
halt_vms = true
+print_logs = false
specifically_selected_vms = []
ARGV.each do |arg|
if arg == '-h' || arg == '--help'
@@ -26,6 +28,8 @@ ARGV.each do |arg|
exit
elsif arg == '--nohalt'
halt_vms = false
+ elsif arg == '--print-logs'
+ print_logs = true
elsif !arg.start_with?('-')
specifically_selected_vms << arg
else
@@ -63,12 +67,12 @@ errors = []
threads = dirs.map do |dir|
Thread.new do
begin
- File.open(dir + "/test.log", "wb") do |logfile|
+ File.open(dir + "/test.log", "w+b") do |logfile|
run_and_log = -> (command) do
logfile.puts ""
logfile.puts "##### #{command} #####"
logfile.flush
- pid = Process.spawn(command, chdir: dir, out: logfile, err: :out)
+ pid = Process.spawn(command, chdir: dir, out: logfile, err: logfile)
Process.waitpid(pid)
$?.success?
end
@@ -101,6 +105,10 @@ threads = dirs.map do |dir|
mutex.synchronize do
puts "Finished VM: #{dir}"
end
+ if print_logs
+ puts File.read(dir + "/test.log")
+ puts
+ end
end
end
end
diff --git a/vagrant/bionic64/Vagrantfile b/vagrant/ubuntu1804/Vagrantfile
index aab9518..6626a1c 100644
--- a/vagrant/bionic64/Vagrantfile
+++ b/vagrant/ubuntu1804/Vagrantfile
@@ -2,7 +2,7 @@
# vi: set ft=ruby :
Vagrant.configure("2") do |config|
- config.vm.box = "ubuntu/bionic64"
+ config.vm.box = "roboxes/ubuntu1804"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "../../", "/bindfs",
@@ -12,7 +12,10 @@ Vagrant.configure("2") do |config|
rsync__args: ["-av", "--delete-after"]
config.vm.provider "virtualbox" do |v|
- v.name = "bindfs-bionic64"
+ v.name = "bindfs-ubuntu1804"
+ 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
diff --git a/vagrant/xenial64/Vagrantfile b/vagrant/ubuntu2004/Vagrantfile
index 2e79925..c37e5be 100644
--- a/vagrant/xenial64/Vagrantfile
+++ b/vagrant/ubuntu2004/Vagrantfile
@@ -2,7 +2,7 @@
# vi: set ft=ruby :
Vagrant.configure("2") do |config|
- config.vm.box = "ubuntu/xenial64"
+ config.vm.box = "roboxes/ubuntu2004"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "../../", "/bindfs",
@@ -12,7 +12,10 @@ Vagrant.configure("2") do |config|
rsync__args: ["-av", "--delete-after"]
config.vm.provider "virtualbox" do |v|
- v.name = "bindfs-xenial64"
+ v.name = "bindfs-ubuntu2004"
+ 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
diff --git a/vagrant/ubuntu2204/Vagrantfile b/vagrant/ubuntu2204/Vagrantfile
new file mode 100644
index 0000000..06be5fd
--- /dev/null
+++ b/vagrant/ubuntu2204/Vagrantfile
@@ -0,0 +1,28 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "roboxes/ubuntu2204"
+
+ config.vm.synced_folder ".", "/vagrant", disabled: true
+ config.vm.synced_folder "../../", "/bindfs",
+ type: "rsync",
+ rsync__auto: false,
+ rsync__exclude: ["vagrant"],
+ rsync__args: ["-av", "--delete-after"]
+
+ config.vm.provider "virtualbox" do |v|
+ v.name = "bindfs-ubuntu2204"
+ 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
+ apt-get update
+ apt-get install -y fuse libfuse-dev build-essential pkg-config ruby valgrind
+ apt-get clean
+ adduser vagrant fuse
+ echo user_allow_other > /etc/fuse.conf
+ SHELL
+end
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-13 18:41:07 +0000