1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00

syncing up box creation with ciab (prepping for focal)

This commit is contained in:
downtownallday
2020-11-05 21:07:50 -05:00
parent 679e660018
commit f81e0d0a85
5 changed files with 43 additions and 57 deletions

View File

@@ -1,35 +1,22 @@
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"
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
use_preloaded_box config, "ubuntu/bionic64"
# fresh install with encryption-at-rest
config.vm.define "remote-nextcloud-docker-ehdd" do |m1|
m1.vm.provision :shell, :inline => <<-SH
source globals.sh || exit 1
cd /mailinabox
source tests/vagrant/globals.sh || exit 1
export PRIMARY_HOSTNAME=qa1.abc.com
export FEATURE_MUNIN=false
export EHDD_KEYFILE=$HOME/keyfile
echo -n "boo" >$EHDD_KEYFILE
cd /mailinabox
tests/system-setup/remote-nextcloud-docker.sh; rc=$?
if [ $rc -eq 0 ]; then
tests/runner.sh ehdd default remote-nextcloud; rc=$?
fi
echo "EXITCODE: $rc"
tests/system-setup/remote-nextcloud-docker.sh || exit 1
tests/runner.sh ehdd default remote-nextcloud || exit 2
SH
end
@@ -37,15 +24,12 @@ SH
config.vm.define "remote-nextcloud-docker" do |m1|
m1.vm.provision :shell, :inline => <<-SH
source globals.sh || exit 1
cd /mailinabox
source tests/vagrant/globals.sh || exit 1
export PRIMARY_HOSTNAME=qa2.abc.com
export FEATURE_MUNIN=false
cd /mailinabox
tests/system-setup/remote-nextcloud-docker.sh upgrade basic; rc=$?
if [ $rc -eq 0 ]; then
tests/runner.sh default remote-nextcloud upgrade-basic; rc=$?
fi
echo "EXITCODE: $rc"
tests/system-setup/remote-nextcloud-docker.sh upgrade basic || exit 1
tests/runner.sh default remote-nextcloud upgrade-basic || exit 2
SH
end
@@ -54,15 +38,12 @@ SH
config.vm.define "upgrade-from-upstream" do |m1|
m1.vm.provision :shell, :inline => <<-SH
source globals.sh || exit 1
cd /mailinabox
source tests/vagrant/globals.sh || exit 1
export PRIMARY_HOSTNAME=qa3.abc.com
export UPSTREAM_TAG=master
cd /mailinabox
tests/system-setup/upgrade-from-upstream.sh basic totpuser; rc=$?
if [ $rc -eq 0 ]; then
tests/runner.sh upgrade-basic upgrade-totpuser default; rc=$?
fi
echo "EXITCODE: $rc"
tests/system-setup/upgrade-from-upstream.sh basic totpuser || exit 1
tests/runner.sh upgrade-basic upgrade-totpuser default || exit 2
SH
end
@@ -80,21 +61,14 @@ SH
config.vm.define "unsetvars" do |m1|
m1.vm.hostname = "mailinabox.lan"
m1.vm.network "private_network", ip: "192.168.50.4"
m1.vm.provision :shell, :inline => <<-SH
# Set environment variables so that the setup script does
# not ask any questions during provisioning. We'll let the
# machine figure out its own public IP.
export NONINTERACTIVE=1
export PUBLIC_IP=auto
export PUBLIC_IPV6=auto
export PRIMARY_HOSTNAME=auto
export SKIP_NETWORK_CHECKS=1
# Start the setup script.
cd /mailinabox
setup/start.sh
echo "EXITCODE: $?"
SH
end
end