Merge ~anonymouse67/review-tools:feature/lzo-script-2-update into review-tools:master

[Ian Johnson]

Miscellaneous usability changes in running the script, but no real changes to the test logic itself so this shouldn't require re-running the script for re-validating the test results.

[Jamie Strandboge (jdstrand)]

LGTM. Thanks!

review: Approve

diff --git a/tests/manual-lzo-part2.sh b/tests/manual-lzo-part2.sh
index edd8237..9aa4cbc 100755
--- a/tests/manual-lzo-part2.sh
+++ b/tests/manual-lzo-part2.sh
@@ -31,7 +31,7 @@ if [ "$#" != 1 ]; then
     exit 1
 fi
 
-TARBALL="$1"
+TARBALL=$(readlink -f "$1")
 
 # TODO: share common snippets of this script with manual-lzo.sh ?
 function is_core_snap {
@@ -118,8 +118,10 @@ for series in 16 18 20; do
 
     sudo "$LXC" file push review-tools.tgz "${cont_name}/root/review-tools.tgz"
 
-    sudo "$LXC" exec "${cont_name}" -- apt update
-    sudo "$LXC" exec "${cont_name}" -- apt upgrade -y
+    # sometimes apt operations fail due to apt parsing, probably a race 
+    # condition, but keep trying
+    sudo "$LXC" exec "${cont_name}" -- /bin/bash -c 'until apt update; do sleep 0.1; done'
+    sudo "$LXC" exec "${cont_name}" -- /bin/bash -c 'until apt upgrade -y; do sleep 0.1; done'
 
     # dependencies for review-tools as per the snapcraft.yaml
     sudo "$LXC" exec "${cont_name}" -- apt install -y binutils fakeroot file libdb5.3 libmagic1 python3-magic python3-requests python3-simplejson python3-yaml squashfs-tools
@@ -205,7 +207,7 @@ done
 
 popd
 
-echo "test done, results in $TARBALL"
+echo "test done"
 
 # reset the cleanup so we don't unnecessarily run it and exit with non-zero status
 trap - EXIT SIGINT SIGTERM