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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/commit-tests.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
env: env:
PRIMARY_HOSTNAME: box2.abc.com PRIMARY_HOSTNAME: box2.abc.com
UPSTREAM_TAG: jammyjellyfish2204 UPSTREAM_TAG: main
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: setup - name: setup

3
tests/system-setup/setup-defaults.sh
View File

@ -71,4 +71,5 @@ export MIABLDAP_RELEASE_TAG="${MIABLDAP_RELEASE_TAG:-v60}"
export PHP_VER=8.0 export PHP_VER=8.0
# Tag of last version supported on Ubuntu Bionic 18.04 # Tag of last version supported on Ubuntu Bionic 18.04
FINAL_RELEASE_TAG_BIONIC64=master #v57a UPSTREAM_FINAL_RELEASE_TAG_BIONIC64=v57a
MIABLDAP_FINAL_RELEASE_TAG_BIONIC64=f6cd8f56c3bcb20969c6cf66c040c8efa3773f3a

4
tests/vagrant/Vagrantfile vendored
View File

@ -49,7 +49,7 @@ SH
m1.vm.provision :shell, :inline => <<-SH m1.vm.provision :shell, :inline => <<-SH
cd /mailinabox cd /mailinabox
export PRIMARY_HOSTNAME=qa3.abc.com 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/system-setup/upgrade-from-upstream.sh --populate=basic --populate=totpuser || exit 1
tests/runner.sh upgrade-basic upgrade-totpuser default || exit 2 tests/runner.sh upgrade-basic upgrade-totpuser default || exit 2
SH SH
@ -84,7 +84,7 @@ SH
if ENV['tests']=='all' or ENV['tests']=='pre-commit' if ENV['tests']=='all' or ENV['tests']=='pre-commit'
config.vm.define "unsetvars" do |m1| config.vm.define "unsetvars" do |m1|
m1.vm.hostname = "mailinabox.lan" 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 m1.vm.provision :shell, :inline => <<-SH
export NONINTERACTIVE=1 export NONINTERACTIVE=1
export PUBLIC_IP=auto 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 source tests/system-setup/setup-defaults.sh
tests/system-setup/vanilla.sh \ tests/system-setup/vanilla.sh \
--checkout-repo="$MIABLDAP_GIT" \ --checkout-repo="$MIABLDAP_GIT" \
--checkout-treeish="$FINAL_RELEASE_TAG_BIONIC64" \ --checkout-treeish="$MIABLDAP_FINAL_RELEASE_TAG_BIONIC64" \
--checkout-targetdir="$HOME/miabldap-bionic" \ --checkout-targetdir="$HOME/miabldap-bionic" \
--populate=basic \ --populate=basic \
--populate=totpuser \ --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 pushd "../../.." >/dev/null
source tests/system-setup/setup-defaults.sh || exit 1 source tests/system-setup/setup-defaults.sh || exit 1
popd >/dev/null popd >/dev/null
@ -34,7 +34,7 @@ boxes=(
# preload packages from source of the following git tags. empty string # preload packages from source of the following git tags. empty string
# means use the current source tree # means use the current source tree
tags=( tags=(
"$FINAL_RELEASE_TAG_BIONIC64" "$MIABLDAP_FINAL_RELEASE_TAG_BIONIC64"
"" ""
) )
try_reboot=( try_reboot=(