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

[Konrad Zapałowicz]

Adopt for new aliases coming with 2.25

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

PASSED: Continuous integration, rev:5c673076f851ee21cd960d447a101ec3a681d4ad
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1516/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1576
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1424/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1966
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1169/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/snapcraft.yaml b/snapcraft.yaml
index bee4825..60aafae 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -7,6 +7,9 @@ description: |
   code at: https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/tpm
 confinement: strict
 
+# NOTE: the alias syntax is depreciated with snapd 2.25 however it needs to
+# stay to guarantee that all clients are updated correctly.
+
 apps:
   tcsd:
     command: sbin/tcsd -f -c $SNAP/etc/tcsd.conf
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index a9c015a..72da575 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -32,8 +32,13 @@ install_snap_under_test() {
 			snap connect tpm:$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
 }