do upgrade tests against maib master

.travis.yml

@@ -41,9 +41,7 @@ jobs:
   # JOB: Upgrade from upstream install
   - env:
       - PRIMARY_HOSTNAME=box2.abc.com
-      #- UPSTREAM_TAG=master
-      - MIAB_UPSTREAM_GIT=https://github.com/fspoettel/mailinabox.git
-      - UPSTREAM_TAG=admin-panel-2fa
+      - UPSTREAM_TAG=master
     name: upgrade-from-upstream
     install:
       - sudo tests/system-setup/upgrade-from-upstream.sh basic totpuser

tests/vagrant/Vagrantfile

@@ -7,6 +7,10 @@ Vagrant.configure("2") do |config|
   if File.file?("preloaded/preloaded-ubuntu-bionic64.box")
     config.vm.box = "preloaded-ubuntu-bionic64"
     config.vm.box_url = "file://" + Dir.pwd + "/preloaded/preloaded-ubuntu-bionic64.box"
+    if Vagrant.has_plugin?('vagrant-vbguest')
+      # do NOT check the correct additions version when booting this machine
+      config.vbguest.auto_update = false
+    end
   else
     config.vm.box = "ubuntu/bionic64"
   end
@@ -52,9 +56,7 @@ SH
     m1.vm.provision :shell, :inline => <<-SH
 source globals.sh || exit 1
 export PRIMARY_HOSTNAME=qa3.abc.com
-#export UPSTREAM_TAG=master
-export MIAB_UPSTREAM_GIT="https://github.com/fspoettel/mailinabox.git"
-export UPSTREAM_TAG="admin-panel-2fa"
+export UPSTREAM_TAG=master
 cd /mailinabox
 tests/system-setup/upgrade-from-upstream.sh basic totpuser; rc=$?
 if [ $rc -eq 0 ]; then