From 273aaaf572fa1c47254b938da882a127a307bf49 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 3 Jul 2024 13:44:27 +0200 Subject: [PATCH] vagrant: use freebsd(13|14)_64 as VM name --- Vagrantfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index deb294ea8..8f4055db7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -331,7 +331,7 @@ Vagrant.configure(2) do |config| b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("bullseye64", ".*none.*") end - config.vm.define "freebsd64old" do |b| + config.vm.define "freebsd13_64" do |b| b.vm.box = "generic/freebsd13" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem @@ -339,16 +339,16 @@ Vagrant.configure(2) do |config| b.ssh.shell = "sh" b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages freebsd", :type => :shell, :inline => packages_freebsd - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("freebsd64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd13_64") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd13_64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("freebsd13_64") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("freebsd64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd64", ".*(fuse3|none).*") + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("freebsd13_64") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd13_64", ".*(fuse3|none).*") end - config.vm.define "freebsd64" do |b| + config.vm.define "freebsd14_64" do |b| b.vm.box = "generic/freebsd14" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem @@ -356,13 +356,13 @@ Vagrant.configure(2) do |config| b.ssh.shell = "sh" b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages freebsd", :type => :shell, :inline => packages_freebsd - b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd64") - b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd64") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("freebsd64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("freebsd14_64") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("freebsd14_64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("freebsd14_64") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse") b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller() - b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("freebsd64") - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd64", ".*(fuse3|none).*") + b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("freebsd14_64") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("freebsd14_64", ".*(fuse3|none).*") end config.vm.define "openbsd64" do |b|