snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:fix-exec-log into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:master

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager
  3. fix-exec-log
  4. Merge into master
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Simon Fels
Approved revision: c3da3fc28a356a1564c909a3cccad29b5f9e434e
Merged at revision: 730050d6c458ad3291b8066defab4cb3fc6978d2
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:fix-exec-log
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:master
Diff against target: 45 lines (+14/-4)
3 files modified
bin/modemmanager (+1/-4)
spread.yaml (+7/-0)
tests/main/installation/task.yaml (+6/-0)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Simon Fels Approve
Review via email: mp+324732@code.launchpad.net

Commit message

Avoid forking on start and fix log level (LP: #1670815)

Description of the change

Avoid forking on start and fix log level (LP: #1670815)

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM, a quick spread test would be nice to grep through the journalctl output and ensure that there is no line with "..ModemManager[1646]: <debug> ..".

review: Needs Fixing
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:da798f9b4d5cf3da9c2ad4013cf89b1de5a3eb3e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1533/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1813
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1441/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2195
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1398/console

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

review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:6158c84c101a1beddcb8197151445124d4deab33
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1534/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1814/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1442/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2196/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1399/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Simon Fels (morphis) :
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:8e212488c541d87df1910a715c0b9c6f08dedcda
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1535/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1815/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1443/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2197/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1400/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:950075ca3ece336c22499c99c329af44dfda9e00
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1538/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1818/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1446/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2200/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1401/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:f8feb314d1fcbcae5c9761dfd7cd4cdb508d3a3f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1539/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1819/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1447/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2201/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1402/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:f69c952168983e83e9de4a05b3748b112f306e9e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1540/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1820
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1448/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2202
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1403/console

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

review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:b3142852213661f710a169f3a6ff28ddf11708b3
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1541/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1821
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1449/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2203
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1404/console

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

review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:c3da3fc28a356a1564c909a3cccad29b5f9e434e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1544/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1834
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1452/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2216
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1415/console

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/modemmanager b/bin/modemmanager
2index f7d2fce..bafdfbc 100755
3--- a/bin/modemmanager
4+++ b/bin/modemmanager
5@@ -8,7 +8,4 @@ set -x
6 # loader happy and find the plugins at the right location
7 export SNAP_APP_PATH=$SNAP
8
9-$SNAP/usr/sbin/ModemManager \
10- --debug \
11- --log-level=DEBUG \
12- "$@"
13+exec $SNAP/usr/sbin/ModemManager "$@"
14diff --git a/spread.yaml b/spread.yaml
15index 01ad806..1368084 100644
16--- a/spread.yaml
17+++ b/spread.yaml
18@@ -44,6 +44,13 @@ exclude:
19 prepare: |
20 . $TESTSLIB/prepare-all.sh
21
22+prepare-each: |
23+ # Cleanup logs so we can just dump what has happened in the debug-each
24+ # step below after a test case ran.
25+ journalctl --rotate
26+ journalctl --vacuum-time=1ms
27+ dmesg -c > /dev/null
28+
29 suites:
30 tests/main/:
31 summary: Full-system tests for ModemManager
32diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
33index acf157b..243f44d 100644
34--- a/tests/main/installation/task.yaml
35+++ b/tests/main/installation/task.yaml
36@@ -11,3 +11,9 @@ execute: |
37
38 # Ensure all necessary plugs/slots are connected
39 snap interfaces | grep -Pzq "modem-manager:service +modem-manager:mmcli"
40+
41+ # Make sure the daemon's parent is PID 1
42+ pgrep -P 1 ModemManager
43+
44+ # Make sure debug log is disabled
45+ ! sudo journalctl --unit=snap.modem-manager.modemmanager.service | MATCH "<debug>"

Subscribers

People subscribed via source and target branches