Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:add-proxies into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:master

[Alfonso Sanchez-Beato]

Add mbim and qmi proxies to the snap

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

FAILED: Continuous integration, rev:ea110b16ab3ca1f3eded8f770eec688b6fd00553
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/540/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/277/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/448/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ea110b16ab3ca1f3eded8f770eec688b6fd00553
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/541/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/278/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/449/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:7413efaee7b00e41ddf9c76a23f2aff3d69eb555
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/544/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/281/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/452/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:7413efaee7b00e41ddf9c76a23f2aff3d69eb555
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/545/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/282/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/453/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ac64a1e7a1da0ad1a99a04e004756411b69434d2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/546/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/283/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/454/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

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

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

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Removed version bump.

<<
What causes this to be started? Can this be tested without having a correct modem available or faked somehow?
>>

It is started when a modem with mbim support is detected. There is no infrastructure for faking this easily, so a real modem is needed for testing.

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

FAILED: Continuous integration, rev:8a90a1c61a95998276f4289e27db4fdca1984772
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/548/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/285/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/456/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:8a90a1c61a95998276f4289e27db4fdca1984772
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/549/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/286/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/457/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:833509cd1ab9b3c1b56144fa784681238e4b4375
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/554/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/290/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/462/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:833509cd1ab9b3c1b56144fa784681238e4b4375
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/555/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/291/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/463/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:a60f8daafb54a0508740a3b65a101c210b8c5e2b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/556/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/292
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/464/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:a60f8daafb54a0508740a3b65a101c210b8c5e2b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/557/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/293
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/465/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

As CI wont pass anymore now (see https://code.launchpad.net/~morphis/snappy-hwe-snaps/+git/network-manager/+merge/314223) we need the same fix for modem-manager. Can you propose one with the same change?

Also if we can't create an automatic integration test we need a manual plainbox test. Can you propose one and link here?

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

FAILED: Continuous integration, rev:b1f57b020dca0e95a813f87bc4edd5fadb3028a1
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/587/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/315/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/495/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:b1f57b020dca0e95a813f87bc4edd5fadb3028a1
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/589/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/317
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/497/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/run-tests.sh b/run-tests.sh
index f2e9079..b4ce91b 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -17,7 +17,7 @@
 set -ex
 
 image_name=ubuntu-core-16.img
-channel=candidate
+channel=stable
 spread_opts=
 force_new_image=0
 test_from_channel=0
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f8dfd22..5e4800c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -49,6 +49,7 @@ parts:
     filesets:
       wanted:
         - lib/libmbim-glib.so*
+        - usr/lib/libmbim/mbim-proxy
 
     snap:
       - $wanted
@@ -72,6 +73,7 @@ parts:
     filesets:
       wanted:
         - lib/libqmi-glib.so*
+        - usr/lib/libqmi/qmi-proxy
 
     snap:
       - $wanted
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index 38bfb5b..1755933 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -11,7 +11,16 @@ snap install --devmode --beta classic
 cat <<-EOF > /home/test/build-snap.sh
 #!/bin/sh
 set -ex
+
+# 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
+
+# Ensure we have the latest updates installed as the core snap
+# may be a bit out of date.
 apt update
+apt full-upgrade -y --force-yes
+
 apt install -y --force-yes snapcraft
 cd /home/modem-manager
 snapcraft clean
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index 8956644..aa3c329 100644
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -29,12 +29,18 @@ if [ -n "$SNAP_CHANNEL" ] ; then
 		snap install --$SNAP_CHANNEL modem-manager
 	fi
 else
+        # Install first from store to avoid error when performing the connection
+        snap install modem-manager
 	# Install prebuilt modem-manager snap
 	snap install --dangerous /home/modem-manager/modem-manager_*_amd64.snap
 	# As we have a snap which we build locally its unasserted and therefore
 	# we don't have any snap-declarations in place and need to manually
 	# connect all plugs.
-	sudo snap connect modem-manager:mmcli modem-manager:service
+	# NOTE This step is not needed (and will produce an error) because we
+	# have made an initial installation for the store. When snapd finally
+	# allows somehow connections of locally installed snaps this can be put
+	# in place again, and the installation from the store removed.
+	##sudo snap connect modem-manager:mmcli modem-manager:service
 fi
 
 # Snapshot of the current snapd state for a later restore