syncing up box creation with ciab (prepping for focal)

tests/vagrant/vanilla/Vagrantfile

@@ -1,26 +1,20 @@
+load '../funcs.rb'
 
 Vagrant.configure("2") do |config|
 
   config.vm.synced_folder "../../..", "/mailinabox", id: "mailinabox", automount: false
-  config.vm.provision "file", source:"../globals.sh", destination:"globals.sh"
+  use_preloaded_box config, "ubuntu/bionic64", ".."
 
   # vanilla install
 
   config.vm.define "vanilla" do |m1|
-    if File.file?("../preloaded/preloaded-ubuntu-bionic64.box")
-      m1.vm.box = "preloaded-ubuntu-bionic64"
-      m1.vm.box_url = "file://" + Dir.pwd + "/../preloaded/preloaded-ubuntu-bionic64.box"
-    else
-      m1.vm.box = "ubuntu/bionic64"
-    end
     m1.vm.network "forwarded_port", guest:443, host:8443, protocol:"tcp"
     m1.vm.provision :shell, :inline => <<-SH
-source globals.sh || exit 1
+cd /mailinabox
+source tests/vagrant/globals.sh || exit 1
 export PRIMARY_HOSTNAME=vanilla.local
 export FEATURE_MUNIN=false
-cd /mailinabox
-tests/system-setup/vanilla.sh; rc=$?
-echo "EXITCODE: $rc"
+tests/system-setup/vanilla.sh
 SH
   end