Merge ~morphis/snappy-hwe-snaps/+git/network-manager:feature/ci-finetuning into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Fine tune tests to work better on our CI

 * Use noninteractive front to prevent apt from requiring user input
 * Dump system logs in debug mode for each test case
 * Fine tune the suspend resume test case to work much better

[Konrad Zapałowicz (kzapalowicz)]

lgtm

review: Approve

[Matteo Croce (teknoraver)]

review: Approve

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

FAILED: Continuous integration, rev:890c2d6d36343173d0c9765ace80d5ff36264758
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/766/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/467/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/674/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:890c2d6d36343173d0c9765ace80d5ff36264758
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/770/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/470/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/678/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:890c2d6d36343173d0c9765ace80d5ff36264758
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/772/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/472
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/680/console

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

diff --git a/spread.yaml b/spread.yaml
index 93cad8f..83abb24 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -39,6 +39,18 @@ exclude:
 prepare: |
   . $TESTSLIB/prepare-all.sh
 
+prepare-each: |
+  # Cleanup logs so we can just dump what has happened in the debug-each
+  # step below after a test case ran.
+  journalctl --rotate
+  sleep .1
+  journalctl --vacuum-time=1ms
+  dmesg -c > /dev/null
+
+debug-each: |
+  journalctl
+  dmesg | grep DENIED || true
+
 # 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
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index 81df7d1..1194d1f 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -18,6 +18,8 @@ cat <<-EOF > /home/test/build-snap.sh
 #!/bin/sh
 set -ex
 
+export DEBIAN_FRONTEND=noninteractive
+
 # FIXME: Enable propose for now until problems with conflicting systemd
 # packages between the Ubuntu Core image ppa and the archive are fixed.
 echo "deb http://archive.ubuntu.com/ubuntu/ xenial-proposed restricted main universe" > /etc/apt/sources.list.d/ubuntu-proposed.list
diff --git a/tests/main/suspend-resume/task.yaml b/tests/main/suspend-resume/task.yaml
index b5df7d1..09cb2cc 100644
--- a/tests/main/suspend-resume/task.yaml
+++ b/tests/main/suspend-resume/task.yaml
@@ -51,7 +51,8 @@ execute: |
     # Kick off the actual suspend in background so that we can continue
     # verifying the correct state left by the system before it would
     # normally enter a sleep state.
-    systemctl suspend --no-block &
+    systemctl suspend --no-block || true
+    sleep 1
 
     # The easiest way to ensure NetworkManager did the right thing is
     # by going through its log output and verifying it prints out