Merge ~morphis/snappy-hwe-snaps/+git/network-manager:bug/enable-proposed into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Enable Ubuntu proposed archive within the classic snap for builds

As the current core snap is based on a systemd deb package from the Ubuntu Core image ppa we run into some conflicts with a newer one from the archive. To fix this issue we need to force upgrade to a newer systemd package from xenial proposed.

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

PASSED: Continuous integration, rev:79ec826d6aa4f1eebdc2d214f77d34b988ab0e6d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/582/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/311
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/490/console

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:79ec826d6aa4f1eebdc2d214f77d34b988ab0e6d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/583/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/312/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/491/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index f8b2eb2..0f13fc4 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -17,7 +17,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/network-manager
 snapcraft clean