external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Code Issues Releases Wiki Activity

do upgrade tests against maib master

Browse Source
This commit is contained in:
downtownallday 2020-10-31 11:32:28 -04:00
parent d1110c4c02
commit 484ffd64ec
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

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

8
tests/vagrant/Vagrantfile vendored
View File

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