Merge ~morphis/snappy-hwe-snaps/+git/network-manager:f/fix-alias-setup into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

tests: fix alias setup for newer snapd versions

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

FAILED: Continuous integration, rev:6c6446ebc8a98a0bedbfcf14d04b5ab33e3a42ff
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1515/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1575/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1423/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1965/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1168/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:5b125d7b699be3dddea19ea41ee3552c83d70f6f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1517/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1577
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1427/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1967
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1170

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

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9e0dcc3..9bf87e2 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -25,8 +25,7 @@ apps:
   nmcli:
     command: usr/bin/nmcli
     plugs: [nmcli]
-    aliases:
-      - nmcli
+    aliases: [nmcli]
   networkmanager:
     command: bin/networkmanager
     daemon: simple
@@ -39,8 +38,7 @@ apps:
     # within the systemd unit file instead for example. Until this
     # is implemented we keep the alias disabled.
     #
-    # aliases:
-    #   - NetworkManager
+    # aliases: [NetworkManager]
 
 parts:
   hooks:
diff --git a/tests/main/aliases/task.yaml b/tests/main/aliases/task.yaml
index e2eff9d..f3fd040 100644
--- a/tests/main/aliases/task.yaml
+++ b/tests/main/aliases/task.yaml
@@ -5,7 +5,12 @@ execute: |
     # have them approved from the store in our snap-declaration assertion.
     test ! -e /snap/bin/nmcli
 
-    snap alias network-manager nmcli
+    snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
+    target=$SNAP_NAME.nmcli
+    if dpkg --compare-versions $snapd_version lt 2.25 ; then
+        target=$SNAP_NAME
+    fi
+    snap alias $target nmcli
 
     test -e /snap/bin/nmcli