From a1c8b79c6f165b3822c867cd5c0c88ef48571cec Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Sat, 29 Oct 2022 09:55:51 -0400
Subject: [PATCH] Change the default behavior to only prepare jammy unless
 "all" given on command line

---
 tests/vagrant/preloaded/create_preloaded.sh | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tests/vagrant/preloaded/create_preloaded.sh b/tests/vagrant/preloaded/create_preloaded.sh
index df786470..c9146fd6 100755
--- a/tests/vagrant/preloaded/create_preloaded.sh
+++ b/tests/vagrant/preloaded/create_preloaded.sh
@@ -11,12 +11,15 @@
 
 # load defaults for MIABLDAP_GIT and MIABLDAP_FINAL_RELEASE_TAG_BIONIC64 (make available to Vagrantfile)
 pushd "../../.." >/dev/null
+source tests/lib/color-output.sh
 source tests/system-setup/setup-defaults.sh || exit 1
 popd >/dev/null
 
+H1 "Destroy any running boxes"
 vagrant destroy -f
 rm -f prepcode.txt
 
+H1 "Ensure plugins are installed"
 for plugin in "vagrant-vbguest" "vagrant-reload"
 do
     if ! vagrant plugin list | grep -F "$plugin" >/dev/null; then
@@ -24,32 +27,40 @@ do
     fi
 done
 
+H1 "Upgrade base boxes"
 vagrant box update
 
 
 boxes=(
-    "preloaded-ubuntu-bionic64"
     "preloaded-ubuntu-jammy64"
+    "preloaded-ubuntu-bionic64"
 )
 # preload packages from source of the following git tags. empty string
 # means use the current source tree
 tags=(
-    "$MIABLDAP_FINAL_RELEASE_TAG_BIONIC64"
     ""
+    "$MIABLDAP_FINAL_RELEASE_TAG_BIONIC64"
 )
 try_reboot=(
-    false
     true
+    false
 )
 idx=0
 
 for box in "${boxes[@]}"
 do
-    if [ ! -z "$1" -a "$1" != "$box" ]; then
-        let idx+=1
-        continue
+    if [ -z "$1" ]; then
+        # no cli arguments - only process first box
+       [ $idx -ge 1 ] && break
+    else
+        # cli argument specifies "all" or a named box
+        if [ "$1" != "all" -a "$1" != "$box" ]; then
+            let idx+=1
+            continue
+        fi
     fi
 
+    H1 "Provision: $box"
     export RELEASE_TAG="${tags[$idx]}"
     vagrant up $box | tee /tmp/$box.out
     upcode=$?