From 2f19ec19daa2456f98e9284e3252f472c9de10ee Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Wed, 12 Oct 2022 08:22:05 -0400
Subject: [PATCH] Update tags now that upstream has merged jammy branch

---
 .github/workflows/commit-tests.yml          | 2 +-
 tests/system-setup/setup-defaults.sh        | 3 ++-
 tests/vagrant/Vagrantfile                   | 4 ++--
 tests/vagrant/majorupgrade/Vagrantfile      | 2 +-
 tests/vagrant/preloaded/create_preloaded.sh | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/commit-tests.yml b/.github/workflows/commit-tests.yml
index 1545fc8c..c5792226 100644
--- a/.github/workflows/commit-tests.yml
+++ b/.github/workflows/commit-tests.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       PRIMARY_HOSTNAME: box2.abc.com
-      UPSTREAM_TAG: jammyjellyfish2204
+      UPSTREAM_TAG: main
     steps:
       - uses: actions/checkout@v2
       - name: setup
diff --git a/tests/system-setup/setup-defaults.sh b/tests/system-setup/setup-defaults.sh
index b545c000..204b4e74 100755
--- a/tests/system-setup/setup-defaults.sh
+++ b/tests/system-setup/setup-defaults.sh
@@ -71,4 +71,5 @@ export MIABLDAP_RELEASE_TAG="${MIABLDAP_RELEASE_TAG:-v60}"
 export PHP_VER=8.0
 
 # 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
diff --git a/tests/vagrant/Vagrantfile b/tests/vagrant/Vagrantfile
index e4071032..dceceb15 100644
--- a/tests/vagrant/Vagrantfile
+++ b/tests/vagrant/Vagrantfile
@@ -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
diff --git a/tests/vagrant/majorupgrade/Vagrantfile b/tests/vagrant/majorupgrade/Vagrantfile
index 22f68cce..1ae2ee87 100644
--- a/tests/vagrant/majorupgrade/Vagrantfile
+++ b/tests/vagrant/majorupgrade/Vagrantfile
@@ -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 \
diff --git a/tests/vagrant/preloaded/create_preloaded.sh b/tests/vagrant/preloaded/create_preloaded.sh
index 707165ef..df786470 100755
--- a/tests/vagrant/preloaded/create_preloaded.sh
+++ b/tests/vagrant/preloaded/create_preloaded.sh
@@ -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=(