Merge ~morphis/snappy-hwe-snaps/+git/network-manager:bug/adjust-for-new-wifi-ap into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

test: fix wifi connect test case after new wifi-ap snap was published

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

PASSED: Continuous integration, rev:c10a754b3cb64fdd70196f153a9eb9c0d5c04dae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/635/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/355
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/543/console

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:c10a754b3cb64fdd70196f153a9eb9c0d5c04dae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/639/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/358/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/547/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:f4a5077d4bf7e12d7164420a21e52ab210b8a418
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/650/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/367/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/558/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:f4a5077d4bf7e12d7164420a21e52ab210b8a418
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/651/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/368/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/559/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:40c8390ead9446a368ee7ae36795e4c1fd5f085a
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/654/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/371/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/562/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:40c8390ead9446a368ee7ae36795e4c1fd5f085a
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/655/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/372/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/563/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:7c25d27be0323cbf7245e3fae205682272557713
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/656/
Executed test runs:
    ABORTED: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/373/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/564/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:7c25d27be0323cbf7245e3fae205682272557713
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/657/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/374/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/565/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:637ee8ebb77b4378e2ce57145e0d83334d6d5a45
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/658/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/376
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/566/console

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

Looks good to me, although there's one comment which should be updated to match the associated code change.

review: Needs Fixing

[Tony Espy (awe)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:637ee8ebb77b4378e2ce57145e0d83334d6d5a45
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/659/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/377/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/567/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:e5eed88a2830812d28266a46c27b127b31d33703
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/660/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/378
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/568/console

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

review: Approve (continuous-integration)

diff --git a/spread.yaml b/spread.yaml
index 0ae35a2..93cad8f 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -39,6 +39,12 @@ exclude:
 prepare: |
   . $TESTSLIB/prepare-all.sh
 
+# Default is 15 min but we use a higher one here as we build the entire
+# network-manager snap inside the global prepare step so we need quite
+# some time. Once we can reuse artifacts from other builds we can change
+# this back to the default.
+kill-timeout: 30m
+
 suites:
     tests/main/:
         summary: Full-system tests for NetworkManager without ethernet support
diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
index 2c7ed53..aa6a70c 100644
--- a/tests/main/wifi-connect-secured-ap/task.yaml
+++ b/tests/main/wifi-connect-secured-ap/task.yaml
@@ -8,18 +8,22 @@ restore: |
     rmmod mac80211_hwsim
 
 execute: |
-    snap install wifi-ap
-
-    # Get two connected wifi network interfaces wlan0 and wlan1
+    # Get two connected wifi network interfaces wlan0 and wlan1 and
+    # give the system soem time to settle
     modprobe mac80211_hwsim radios=2
+    sleep 1
 
-    # Setup the AP on wlan1
-    /snap/bin/wifi-ap.config set wifi.interface wlan1
+    snap install wifi-ap
+    # FIXME: until the wifi-ap utility is clever enough to retry
+    # connecting with the service we need to add a short sleep here
+    sleep 0.5
+
+    # Setup the AP on wlan0
+    /snap/bin/wifi-ap.config set wifi.interface wlan0
     /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
     while ! /snap/bin/network-manager.nmcli d wifi | grep Ubuntu ; do
@@ -31,4 +35,4 @@ execute: |
 
     # Connect to the AP and ensure the connection was established
     /snap/bin/network-manager.nmcli d wifi connect $WIFI_SSID password $WIFI_PASSPHRASE
-    /snap/bin/network-manager.nmcli d | grep 'wlan0.*connected'
+    /snap/bin/network-manager.nmcli d | grep 'wlan1.*connected'