Merge ~kzapalowicz/snappy-hwe-snaps/+git/tpm2:fix/adopt-new-aliases into ~snappy-hwe-team/snappy-hwe-snaps/+git/tpm2:master

[Konrad Zapałowicz]

Adopt for new aliases coming with 2.25

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:b7476952465c508f16a6acf81a9fbc4f2f1f16d5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1520/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1580
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1430/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1970
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1173/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1520/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3013b9b..7764654 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -8,6 +8,9 @@ description: |
 confinement: strict
 grade: stable
 
+# NOTE: the alias syntax is depreciated with snapd 2.25 however it needs to
+# stay to guarantee that all clients are updated correctly.
+
 apps:
   resourcemgr:
     command: sbin/resourcemgr
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index 03e29dc..0427c0d 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -32,8 +32,13 @@ install_snap_under_test() {
 			snap connect ${SNAP_NAME}:${plug} core
 		done
 		# Setup all necessary aliases
+		snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
 		for alias in $SNAP_AUTO_ALIASES ; do
-			snap alias $SNAP_NAME $alias
+			target=$SNAP_NAME.$alias
+			if dpkg --compare-versions $snapd_version lt 2.25 ; then
+				target=$SNAP_NAME
+			fi
+			snap alias $target $alias
 		done
 	fi
 }