Merge ~morphis/snappy-hwe-snaps/+git/network-manager:bump-nm-version into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Bump the tag used for the network-manager source branch

This will get the DHCP lease movement test case working and prepares us for the next release.

This also fixes some spread tests which were failing in CI and we didn't fixed before.

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

FAILED: Continuous integration, rev:476d15bc8e210a1b704a9b4f574a5096a7651d08
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/351/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/259/console

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

review: Needs Fixing (continuous-integration)

[Tony Espy (awe)]

+1

review: Approve

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

FAILED: Continuous integration, rev:476d15bc8e210a1b704a9b4f574a5096a7651d08
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/352/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/102/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/260/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:50f2094a1381f3de34484d6d4299cff038951d5d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/376/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/126/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/284/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:50f2094a1381f3de34484d6d4299cff038951d5d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/377/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/127/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/285/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:58be9d3bdae1c62dfcd196e4f79ac40806372e50
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/378/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/128/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/286/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:58be9d3bdae1c62dfcd196e4f79ac40806372e50
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/379/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/129
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/287/console

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

review: Approve (continuous-integration)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2e9044f..e34b875 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -60,7 +60,7 @@ parts:
     # needed. Otherwise use the tag to the latest version which will be
     # used by the published snap.
     # source-branch: network-manager/xenial/1.2.2
-    source-tag: network-manager-xenial-1.2.2-1
+    source-tag: network-manager-xenial-1.2.2-2
 
     build-packages:
       - intltool
diff --git a/tests/full/dhcp-leases-are-moved/task.yaml b/tests/full/dhcp-leases-are-moved/task.yaml
index 1dc1914..80cf0e9 100644
--- a/tests/full/dhcp-leases-are-moved/task.yaml
+++ b/tests/full/dhcp-leases-are-moved/task.yaml
@@ -5,13 +5,23 @@ execute: |
 
     wait_for_network_manager
 
-    # We should have a single lease for eth0 at this point
+    # We should have a single lease for eth0 at this point but give
+    # NetworkManager some time to do its job
     test -e /run/NetworkManager/dhcp
     test -e /var/snap/network-manager/current/state/dhcp
-
-    num_leases=`ls -1 /var/snap/network-manager/current/state/dhcp | wc -l`
-    num_public_leases=`ls -1 /run/NetworkManager/dhcp | wc -l`
-    test $num_leases -eq $num_public_leases
+    n=0
+    state_ok=0
+    while [ $n -lt 10 ] ; do
+        num_leases=`ls -1 /var/snap/network-manager/current/state/dhcp | wc -l`
+        num_public_leases=`ls -1 /run/NetworkManager/dhcp | wc -l`
+        if [ $num_leases -eq $num_public_leases ]; then
+            state_ok=1
+            break
+        fi
+        sleep 0.5
+        let n=n+1
+    done
+    test $state_ok -eq 1
 
     # Create a new lease file and ensure it gets copied over
     test ! -e /run/NetworkManager/dhcp/temp.lease
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index 208cefa..6632406 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -6,6 +6,12 @@ if [ -n "$SNAP_CHANNEL" ] ; then
 	exit 0
 fi
 
+# If there is a network-manager snap prebuilt for us, lets take
+# that one to speed things up.
+if [ -e /home/network-manager/network-manager_*_amd64.snap ] ; then
+	exit 0
+fi
+
 # Setup classic snap and build the network-manager snap in there
 snap install --devmode --beta classic
 cat <<-EOF > /home/test/build-snap.sh
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index 7df7c81..d290bbc 100644
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -29,14 +29,11 @@ if [ -n "$SNAP_CHANNEL" ] ; then
 		snap install --$SNAP_CHANNEL network-manager
 	fi
 else
-	# Install prebuilt network-manager snap
+	# Need first install from store to get all necessary assertions into
+	# place. Second local install will then bring in our locally built
+	# snap.
+	snap install network-manager
 	snap install --dangerous /home/network-manager/network-manager_*_amd64.snap
-	# As we have a snap which we build locally its unasserted and therefor
-	# we don't have any snap-declarations in place and need to manually
-	# connect all plugs.
-	snap connect network-manager:nmcli network-manager:service
-	snap connect network-manager:network-setup-observe
-	snap connect network-manager:ppp
 fi
 
 # Snapshot of the current snapd state for a later restore
diff --git a/tests/main/switch-netplan-renderer/task.yaml b/tests/main/switch-netplan-renderer/task.yaml
index 1c05b68..4453b6a 100644
--- a/tests/main/switch-netplan-renderer/task.yaml
+++ b/tests/main/switch-netplan-renderer/task.yaml
@@ -4,6 +4,8 @@ execute: |
     . $TESTSLIB/utilities.sh
     case "$SPREAD_REBOOT" in
         0)
+            wait_for_network_manager
+
             # networkd manages eth0 and NetworkManager does not
             networkctl | grep 'eth0.*routable'
             /snap/bin/network-manager.nmcli d | grep 'eth0.*unmanaged'
diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
index 036f8de..ed56a9b 100644
--- a/tests/main/wifi-connect-secured-ap/task.yaml
+++ b/tests/main/wifi-connect-secured-ap/task.yaml
@@ -11,11 +11,11 @@ execute: |
     modprobe mac80211_hwsim radios=2
 
     # Setup the AP on wlan1
-    wifi-ap.config set wifi.interface wlan1
-    wifi-ap.config set wifi.ssid $WIFI_SSID
-    wifi-ap.config set wifi.security wpa2
-    wifi-ap.config set wifi.security-passphrase $WIFI_PASSPHRASE
-    wifi-ap.config set disabled 0
+    /snap/bin/wifi-ap.config set wifi.interface wlan1
+    /snap/bin/wifi-ap.config set wifi.ssid $WIFI_SSID
+    /snap/bin/wifi-ap.config set wifi.security wpa2
+    /snap/bin/wifi-ap.config set wifi.security-passphrase $WIFI_PASSPHRASE
+    /snap/bin/wifi-ap.config set disabled 0
     systemctl restart snap.wifi-ap.backend
     # AP needs a bit to appear and be visible for NetworkManager
     /snap/bin/network-manager.nmcli d wifi rescan