snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:disable-qrtr into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-20

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager
  3. disable-qrtr
  4. Merge into snap-20
Proposed by Alfonso Sanchez-Beato
Status: Rejected
Rejected by: Alfonso Sanchez-Beato
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:disable-qrtr
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-20
Diff against target: 22 lines (+4/-1)
1 file modified
bin/modemmanager (+4/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Needs Fixing
Review via email: mp+434638@code.launchpad.net

Commit message

bin: add --test-no-qrtr argument when starting MM

So we do not use qualcomm IPC router, that is not enabled in 20.04
ubuntu kernel. This is a workaround for LP#1998194.

Description of the change

bin: add --test-no-qrtr argument when starting MM

So we do not use qualcomm IPC router, that is not enabled in 20.04
ubuntu kernel. This is a workaround for LP#1998194.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 3b3c5f046733d97ad8ee550f6649e371d7419bf7

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1584/

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

FAILED: Continuous integration, rev:3b3c5f046733d97ad8ee550f6649e371d7419bf7
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/780/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/803/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/803
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/803
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/803
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1584
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1326
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1394/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/780/rebuild

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

PASSED: Successfully build documentation, rev: 3b3c5f046733d97ad8ee550f6649e371d7419bf7

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1585/

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

FAILED: Continuous integration, rev:3b3c5f046733d97ad8ee550f6649e371d7419bf7
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/781/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/804/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/804
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/804
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/804
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1585
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1327
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1395/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/781/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Tests failing, in fact it looks like qrtr is not being enabled at compile time.

Unmerged commits

3b3c5f0... by Alfonso Sanchez-Beato

bin: add --test-no-qrtr argument when starting MM

So we do not use qualcomm IPC router, that is not enabled in 20.04
ubuntu kernel. This is a workaround for LP#1998194.

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 d96fb06..dc9c6e3 100755
3--- a/bin/modemmanager
4+++ b/bin/modemmanager
5@@ -5,7 +5,7 @@ set -ex
6 # Until we've reworked the patch which adds snappy support to
7 # ModemManager we keep this as a rework to make the plugin
8 # loader happy and find the plugins at the right location
9-export SNAP_APP_PATH=$SNAP
10+export SNAP_APP_PATH="$SNAP"
11
12 LOG_LEVEL="INFO"
13 DEBUG=""
14@@ -14,5 +14,8 @@ if [ -f "$SNAP_DATA"/.debug_enabled ]; then
15 DEBUG="--debug"
16 fi
17
18+# --test-no-qrtr is a workaround for LP#1998194. This is not
19+# needed for 22.04 or later ubuntu kernel.
20 exec "$SNAP"/usr/sbin/ModemManager --filter-policy=STRICT \
21+ --test-no-qrtr \
22 $DEBUG --log-level="$LOG_LEVEL" "$@"

Subscribers

People subscribed via source and target branches