Merge ~jhodapp/snappy-hwe-snaps/+git/alsa-utils:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/alsa-utils:master

[Jim Hodapp]

Adopt for new aliases coming with snapd v2.25

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

PASSED: Continuous integration, rev:be5d971a16a6d39205554b42cf58b1ab84f7c791
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1514/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1564
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1422/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1954
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1157/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/snapcraft.yaml b/snapcraft.yaml
index e798d0c..ce7a5e8 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -17,88 +17,71 @@ apps:
     speaker-test:
         command: usr/bin/speaker-test
         plugs: [ alsa, home ]
-        aliases:
-            - speaker-test
+        aliases: [speaker-test]
     alsactl:
         command: usr/sbin/alsactl
         plugs: [ alsa, home ]
-        aliases:
-            - alsactl
+        aliases: [alsactl]
     amixer:
         command: usr/bin/amixer
         plugs: [ alsa, home ]
-        aliases:
-            - amixer
+        aliases: [amixer]
     aplay:
         command: usr/bin/aplay
         plugs: [ alsa, home ]
-        aliases:
-            - aplay
+        aliases: [aplay]
     aseqnet:
         command: usr/bin/aseqnet
         plugs: [ alsa, home ]
-        aliases:
-            - aseqnet
+        aliases: [aseqnet]
     alsatplg:
         command: usr/bin/alsatplg
         plugs: [ alsa, home ]
-        aliases:
-            - alsatplg
+        aliases: [alsatplg]
     arecordmidi:
         command: usr/bin/arecordmidi
         plugs: [ alsa, home ]
-        aliases:
-            - arecordmidi
+        aliases: [arecordmidi]
     amidi:
         command: usr/bin/amidi
         plugs: [ alsa, home ]
-        aliases:
-            - amidi
+        aliases: [amidi]
     alsaloop:
         command: usr/bin/alsaloop
         plugs: [ alsa, home ]
-        aliases:
-            - alsaloop
+        aliases: [alsaloop]
     alsaucm:
         command: usr/bin/alsaucm
         plugs: [ alsa, home ]
-        aliases:
-            - alsaucm
+        aliases: [alsaucm]
     aconnect:
         command: usr/bin/aconnect
         plugs: [ alsa, home ]
-        aliases:
-            - aconnect
+        aliases: [aconnect]
     iecset:
         command: usr/bin/iecset
         plugs: [ alsa, home ]
-        aliases:
-            - iecset
+        aliases: [iecset]
     alsabat:
         command: usr/bin/alsabat
         plugs: [ alsa, home ]
-        aliases:
-            - alsabat
+        aliases: [alsabat]
     aseqdump:
         command: usr/bin/aseqdump
         plugs: [ alsa, home ]
-        aliases:
-            - aseqdump
+        aliases: [aseqdump]
     aplaymidi:
         command: usr/bin/aplaymidi
         plugs: [ alsa, home ]
-        aliases:
-            - aplaymidi
+        aliases: [aplaymidi]
     alsamixer:
         command: usr/bin/alsamixer
         plugs: [ alsa, home ]
-        aliases:
-            - alsamixer
+        aliases: [alsamixer]
     arecord:
         command: usr/bin/arecord
         plugs: [ alsa, home ]
-        aliases:
-            - arecord
+        aliases: [arecord]
 
 plugs:
     device-conf:
diff --git a/tests/integration/lib/utilities.sh b/tests/integration/lib/utilities.sh
index 1c89ef4..fc28747 100644
--- a/tests/integration/lib/utilities.sh
+++ b/tests/integration/lib/utilities.sh
@@ -32,8 +32,13 @@ install_snap_under_test() {
 			snap connect alsa-utils:$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
 }