Fix preseed test to used core20 snap on latest systems

Images are using core20 on systems 20-10 and 21.04 

1 files changed, 20 insertions, 14 deletions

diff --git a/tests/main/preseed/task.yaml b/tests/main/preseed/task.yaml
index 619793a55f..0597fd7318 100644
--- a/tests/main/preseed/task.yaml
+++ b/tests/main/preseed/task.yaml
@@ -42,6 +42,12 @@ restore: |
 umount_ubuntu_image "$IMAGE_MOUNTPOINT" || true
 
 execute: |
+ if os.query is-focal; then
+ core_snap=core18
+ else
+ core_snap=core20
+ fi
+
 echo "Checking missing chroot path arg error"
 /usr/lib/snapd/snap-preseed 2>&1 | MATCH "error: need chroot path as argument"
 
@@ -68,15 +74,15 @@ execute: |
 MATCH "Done .+ set-auto-aliases +Set automatic aliases for snap \"snapd\"" < tasks.log
 MATCH "Done .+ setup-aliases +Setup snap \"snapd\" aliases" < tasks.log
 
- MATCH "Done .+ prerequisites +Ensure prerequisites for \"core18\" are available" < tasks.log
- MATCH "Done .+ prepare-snap +Prepare snap \"/var/lib/snapd/seed/snaps/core18_[0-9]+.snap" < tasks.log
- MATCH "Done .+ mount-snap +Mount snap \"core18\" \([0-9]+\)" < tasks.log
- MATCH "Done .+ copy-snap-data +Copy snap \"core18\" data" < tasks.log
- MATCH "Done .+ setup-profiles +Setup snap \"core18\" \([0-9]+\) security profiles" < tasks.log
- MATCH "Done .+ link-snap +Make snap \"core18\" \([0-9]+\) available to the system" < tasks.log
- MATCH "Done .+ auto-connect +Automatically connect eligible plugs and slots of snap \"core18\"" < tasks.log
- MATCH "Done .+ set-auto-aliases +Set automatic aliases for snap \"core18\"" < tasks.log
- MATCH "Done .+ setup-aliases +Setup snap \"core18\" aliases" < tasks.log
+ MATCH "Done .+ prerequisites +Ensure prerequisites for \"$core_snap\" are available" < tasks.log
+ MATCH "Done .+ prepare-snap +Prepare snap \"/var/lib/snapd/seed/snaps/${core_snap}_[0-9]+.snap" < tasks.log
+ MATCH "Done .+ mount-snap +Mount snap \"$core_snap\" \([0-9]+\)" < tasks.log
+ MATCH "Done .+ copy-snap-data +Copy snap \"$core_snap\" data" < tasks.log
+ MATCH "Done .+ setup-profiles +Setup snap \"$core_snap\" \([0-9]+\) security profiles" < tasks.log
+ MATCH "Done .+ link-snap +Make snap \"$core_snap\" \([0-9]+\) available to the system" < tasks.log
+ MATCH "Done .+ auto-connect +Automatically connect eligible plugs and slots of snap \"$core_snap\"" < tasks.log
+ MATCH "Done .+ set-auto-aliases +Set automatic aliases for snap \"$core_snap\"" < tasks.log
+ MATCH "Done .+ setup-aliases +Setup snap \"$core_snap\" aliases" < tasks.log
 
 MATCH "Done .+ prerequisites +Ensure prerequisites for \"lxd\" are available" < tasks.log
 MATCH "Done .+ prepare-snap +Prepare snap \"/var/lib/snapd/seed/snaps/lxd_[0-9]+.snap\" \([0-9]+\)" < tasks.log
@@ -97,7 +103,7 @@ execute: |
 [ "$(grep -c ' Done ' tasks.log)" = "32" ]
 
 # everything below is pending execution on first boot
- MATCH "Do .+ run-hook +Run install hook of \"core18\" snap if present" < tasks.log
+ MATCH "Do .+ run-hook +Run install hook of \"$core_snap\" snap if present" < tasks.log
 MATCH "Do .+ start-snap-services +Start snap \"lxd\" \([0-9]+\) services" < tasks.log
 MATCH "Do .+ run-hook +Run configure hook of \"lxd\" snap if present" < tasks.log
 MATCH "Do .+ run-hook +Run health check of \"lxd\" snap" < tasks.log
@@ -105,8 +111,8 @@ execute: |
 MATCH "Do .+ run-hook +Run install hook of \"snapd\" snap if present" < tasks.log
 MATCH "Do .+ start-snap-services +Start snap \"snapd\" \(unset\) services" < tasks.log
 MATCH "Do .+ run-hook +Run configure hook of \"core\" snap if present" < tasks.log
- MATCH "Do .+ start-snap-services +Start snap \"core18\" \([0-9]+\) services" < tasks.log
- MATCH "Do .+ run-hook +Run health check of \"core18\" snap" < tasks.log
+ MATCH "Do .+ start-snap-services +Start snap \"$core_snap\" \([0-9]+\) services" < tasks.log
+ MATCH "Do .+ run-hook +Run health check of \"$core_snap\" snap" < tasks.log
 MATCH "Do .+ run-hook +Run install hook of \"lxd\" snap if present" < tasks.log
 
 echo "Checking that apparmor and seccomp profiles have been created on the target image"
@@ -127,8 +133,8 @@ execute: |
 test -f "$SYSTEMD_UNITS"/system/snap-lxd-*.mount
 test -L "$SYSTEMD_UNITS"/system/multi-user.target.wants/snap-lxd-*.mount
 test -f "$SYSTEMD_UNITS"/system/snap-snapd-*.mount
- test -f "$SYSTEMD_UNITS"/system/snap-core18-*.mount
- test -L "$SYSTEMD_UNITS"/system/multi-user.target.wants/snap-core18-*.mount
+ test -f "$SYSTEMD_UNITS"/system/snap-"$core_snap"-*.mount
+ test -L "$SYSTEMD_UNITS"/system/multi-user.target.wants/snap-"$core_snap"-*.mount
 test -L "$SYSTEMD_UNITS"/system/multi-user.target.wants/snap-snapd-*.mount
 
 for unit in snap.lxd.daemon.service snap.lxd.daemon.unix.socket snap.lxd.activate.service; do