1
diff --git a/spread.yaml b/spread.yaml
2
index 93cad8f..83abb24 100644
3
--- a/spread.yaml
4
+++ b/spread.yaml
5
@@ -39,6 +39,18 @@ exclude:
6
39
prepare: |
39
prepare: |
7
40
  . $TESTSLIB/prepare-all.sh
40
  . $TESTSLIB/prepare-all.sh
8
41
41
9
42
prepare-each: |
10
43
  # Cleanup logs so we can just dump what has happened in the debug-each
11
44
  # step below after a test case ran.
12
45
  journalctl --rotate
13
46
  sleep .1
14
47
  journalctl --vacuum-time=1ms
15
48
  dmesg -c > /dev/null
16
49
17
50
debug-each: |
18
51
  journalctl
19
52
  dmesg | grep DENIED || true
20
53
21
42
# Default is 15 min but we use a higher one here as we build the entire
54
# Default is 15 min but we use a higher one here as we build the entire
22
43
# network-manager snap inside the global prepare step so we need quite
55
# network-manager snap inside the global prepare step so we need quite
23
44
# some time. Once we can reuse artifacts from other builds we can change
56
# some time. Once we can reuse artifacts from other builds we can change
24
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
25
index 81df7d1..1194d1f 100644
26
--- a/tests/lib/prepare-all.sh
27
+++ b/tests/lib/prepare-all.sh
28
@@ -18,6 +18,8 @@ cat <<-EOF > /home/test/build-snap.sh
29
18
#!/bin/sh
18
#!/bin/sh
30
19
set -ex
19
set -ex
31
20
20
32
21
export DEBIAN_FRONTEND=noninteractive
33
22
34
21
# FIXME: Enable propose for now until problems with conflicting systemd
23
# FIXME: Enable propose for now until problems with conflicting systemd
35
22
# packages between the Ubuntu Core image ppa and the archive are fixed.
24
# packages between the Ubuntu Core image ppa and the archive are fixed.
36
23
echo "deb http://archive.ubuntu.com/ubuntu/ xenial-proposed restricted main universe" > /etc/apt/sources.list.d/ubuntu-proposed.list
25
echo "deb http://archive.ubuntu.com/ubuntu/ xenial-proposed restricted main universe" > /etc/apt/sources.list.d/ubuntu-proposed.list
37
diff --git a/tests/main/suspend-resume/task.yaml b/tests/main/suspend-resume/task.yaml
38
index b5df7d1..09cb2cc 100644
39
--- a/tests/main/suspend-resume/task.yaml
40
+++ b/tests/main/suspend-resume/task.yaml
41
@@ -51,7 +51,8 @@ execute: |
42
51
    # Kick off the actual suspend in background so that we can continue
51
    # Kick off the actual suspend in background so that we can continue
43
52
    # verifying the correct state left by the system before it would
52
    # verifying the correct state left by the system before it would
44
53
    # normally enter a sleep state.
53
    # normally enter a sleep state.
46
54
    systemctl suspend --no-block &
54
    systemctl suspend --no-block || true
47
55
    sleep 1
48
55
56
49
56
    # The easiest way to ensure NetworkManager did the right thing is
57
    # The easiest way to ensure NetworkManager did the right thing is
50
57
    # by going through its log output and verifying it prints out
58
    # by going through its log output and verifying it prints out
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2017-02-02
Approved revision:	890c2d6d36343173d0c9765ace80d5ff36264758
Merged at revision:	4d86eebc64e02fd81fa664cd555efeaf6a1499b2
Proposed branch:	~morphis/snappy-hwe-snaps/+git/network-manager:feature/ci-finetuning
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target:	50 lines (+16/-1) 3 files modified spread.yaml (+12/-0) tests/lib/prepare-all.sh (+2/-0) tests/main/suspend-resume/task.yaml (+2/-1)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alfonso Sanchez-Beato		2017-02-02	Approve on 2017-02-02
System Enablement Bot	continuous-integration		Approve on 2017-02-02
Matteo Croce (community)			Approve on 2017-02-02
Konrad Zapałowicz (community)		2017-02-02	Approve on 2017-02-02
Tony Espy		2017-02-02	Pending
Review via email: mp+316201@code.launchpad.net