external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-12 17:07:23 +01:00
Code Issues Releases Wiki Activity

Update tags now that upstream has merged jammy branch

Browse Source
This commit is contained in:
downtownallday
2022-10-12 08:22:05 -04:00
parent a9d34441fa
commit 2f19ec19da
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/vagrant/Vagrantfile vendored
View File

@@ -49,7 +49,7 @@ SH
m1.vm.provision :shell, :inline => <<-SH
cd /mailinabox
export PRIMARY_HOSTNAME=qa3.abc.com
export UPSTREAM_TAG=jammyjellyfish2204
export UPSTREAM_TAG=main
tests/system-setup/upgrade-from-upstream.sh --populate=basic --populate=totpuser || exit 1
tests/runner.sh upgrade-basic upgrade-totpuser default || exit 2
SH
@@ -84,7 +84,7 @@ SH
if ENV['tests']=='all' or ENV['tests']=='pre-commit'
config.vm.define "unsetvars" do |m1|
m1.vm.hostname = "mailinabox.lan"
m1.vm.network "private_network", ip: "192.168.50.4"
m1.vm.network "private_network", ip: "192.168.56.4"
m1.vm.provision :shell, :inline => <<-SH
export NONINTERACTIVE=1
export PUBLIC_IP=auto

2
tests/vagrant/majorupgrade/Vagrantfile vendored
View File

@@ -27,7 +27,7 @@ export FEATURE_MUNIN=false
source tests/system-setup/setup-defaults.sh
tests/system-setup/vanilla.sh \
--checkout-repo="$MIABLDAP_GIT" \
--checkout-treeish="$FINAL_RELEASE_TAG_BIONIC64" \
--checkout-treeish="$MIABLDAP_FINAL_RELEASE_TAG_BIONIC64" \
--checkout-targetdir="$HOME/miabldap-bionic" \
--populate=basic \
--populate=totpuser \

4
tests/vagrant/preloaded/create_preloaded.sh
View File

@@ -9,7 +9,7 @@
#####
# load defaults for MIABLDAP_GIT and FINAL_RELEASE_TAG_BIONIC64 (make available to Vagrantfile)
# load defaults for MIABLDAP_GIT and MIABLDAP_FINAL_RELEASE_TAG_BIONIC64 (make available to Vagrantfile)
pushd "../../.." >/dev/null
source tests/system-setup/setup-defaults.sh || exit 1
popd >/dev/null
@@ -34,7 +34,7 @@ boxes=(
# preload packages from source of the following git tags. empty string
# means use the current source tree
tags=(
"$FINAL_RELEASE_TAG_BIONIC64"
"$MIABLDAP_FINAL_RELEASE_TAG_BIONIC64"
""
)
try_reboot=(