From 129623cc6b0bbf12fb035f91619b92305ff2ae7b Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 25 Apr 2024 17:32:27 -0600 Subject: [PATCH] quick-test: handle ubuntu-desktop-bootstrap --- scripts/quick-test-this-branch.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/quick-test-this-branch.sh b/scripts/quick-test-this-branch.sh index 13ec0d13..7a75577d 100755 --- a/scripts/quick-test-this-branch.sh +++ b/scripts/quick-test-this-branch.sh @@ -17,8 +17,14 @@ tmpdir="$(mktemp -d)" cd "${tmpdir}" PYTHONPATH=$LIVEFS_EDITOR python3 -m livefs_edit $old_iso /dev/null --setup-rootfs \ - --shell 'cp rootfs//var/lib/snapd/seed/snaps/subiquity_*.snap '$tmpdir'/old.snap' + --shell 'cp rootfs/var/lib/snapd/seed/snaps/subiquity_*.snap '$tmpdir'/old.snap || \ + cp rootfs/var/lib/snapd/seed/snaps/ubuntu-desktop-bootstrap_*.snap '$tmpdir'/old.snap' -$src/scripts/slimy-update-snap.sh old.snap subiquity_new.snap +if [ ! -f old.snap ] ; then + echo "subiquity-like snap not found" + exit 1 +fi -PYTHONPATH=$LIVEFS_EDITOR python3 -m livefs_edit $old_iso $new_iso --inject-snap subiquity_new.snap +$src/scripts/slimy-update-snap.sh old.snap new.snap + +PYTHONPATH=$LIVEFS_EDITOR python3 -m livefs_edit $old_iso $new_iso --inject-snap new.snap