Merge ~morphis/snappy-hwe-snaps/+git/pulseaudio:bug/enable-proposed into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio: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.

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:c755d8efbfba373d962c36edb6af99497c50b979
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/584/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/492/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:c755d8efbfba373d962c36edb6af99497c50b979
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/585/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/313
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/493/console

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

review: Approve (continuous-integration)

diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index a65d357..e53efb4 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -11,13 +11,22 @@ 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 upgrade --yes --force-yes
+
 apt install -y --force-yes snapcraft
 cd /home/pulseaudio
 snapcraft clean
 snapcraft
 EOF
+
 chmod +x /home/test/build-snap.sh
 sudo classic /home/test/build-snap.sh
 snap remove classic