From dc36403c0e3c68b16c10c9ec5c5e07de6e7b8ce5 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 8 Apr 2018 23:41:54 +0200 Subject: [PATCH 1/2] vagrant: use local 32 and 64bit debian jessie boxes --- Vagrantfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 375a64cf4..9093af3ec 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -430,8 +430,20 @@ Vagrant.configure(2) do |config| b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("stretch64") end + config.vm.define "jessie32" do |b| + b.vm.box = "debian8-i386" + b.vm.provider :virtualbox do |v| + v.memory = 768 + $wmem + end + b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") + b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("jessie64") + b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg(true) + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("jessie64") + end + config.vm.define "jessie64" do |b| - b.vm.box = "debian/jessie64" + b.vm.box = "debian8-amd64" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end From fdc7eb57eab9ead2cbe04fc3e6ebda3dc874a8e8 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 28 Apr 2018 00:54:31 +0200 Subject: [PATCH 2/2] use pyenv-based build/test on jessie32/62 --- Vagrantfile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 9093af3ec..b795630b7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -437,9 +437,13 @@ Vagrant.configure(2) do |config| end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("jessie64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("jessie32") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("jessie32") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("jessie32") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg(true) - b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("jessie64") + 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("jessie32") + b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("jessie32") end config.vm.define "jessie64" do |b| @@ -449,8 +453,12 @@ Vagrant.configure(2) do |config| end b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant") b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant") - b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("jessie64") + b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("jessie64") + b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("jessie64") + b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("jessie64") b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg(true) + 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("jessie64") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("jessie64") end