tests/nested/manual/muinstaller-core: use built snapd snap

tests/nested/manual/muinstaller-core/task.yaml

@@ -82,16 +82,16 @@ execute: |
   fi
   mv "${NESTED_ASSETS_DIR}"/pc-kernel_*.snap pc-kernel.snap
 
+  "${TESTSTOOLS}/snaps-state" repack_snapd_deb_into_snap snapd
+
   # prepare a core seed
-  # TODO:
-  # - repacked snapd snap
-  # (should be as simple as adding "--snap=./local-snapd.snap ...")
   SEED_DIR="core-seed"
   wget -q https://raw.githubusercontent.com/snapcore/models/master/ubuntu-core-"$version"-amd64-dangerous.model -O my.model
   snap prepare-image \
       --channel=edge \
       --snap ./pc-kernel.snap \
       --snap ./pc.snap \
+      --snap ./snapd-from-deb.snap \
       my.model \
       ./"$SEED_DIR"
 
@@ -227,13 +227,13 @@ execute: |
   remote.exec "sudo snap recovery" | MATCH "${LABEL}\s+canonical\*\*\s+ubuntu-core-$version-amd64-dangerous\s+current"
 
   # check for unasserted snaps
-  for sn in pc pc-kernel; do
+  for sn in snapd pc pc-kernel; do
       sn_version=$(remote.exec "snap list ${sn}" | awk 'NR != 1 { print $2 }')
       remote.exec "test -f /run/mnt/ubuntu-seed/systems/${LABEL}/snaps/${sn}_${sn_version}.snap"
   done
 
   # check for asserted snaps
-  for sn in snapd core"$version"; do
+  for sn in core"$version"; do
       rev=$(remote.exec "snap list ${sn}" | awk 'NR != 1 { print $3 }')
       remote.exec "test -f /run/mnt/ubuntu-seed/snaps/${sn}_${rev}.snap"
   done