Merge pull request canonical#1982 from dbungert/quick-test-udb

quick-test: handle ubuntu-desktop-bootstrap
Chris-Peterson444 · Apr 26, 2024 · 389a50e · 389a50e
2 parents 65f8ef5 + 129623c
commit 389a50e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git 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