Merge ~kzapalowicz/snappy-hwe-snaps/+git/pulseaudio:feature/fix-runtime-issues into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

[Konrad Zapałowicz]

Fix issues related with running the snap on the target system.

The introduced changes deal with:

1.

SecComp complaining of using send syscall

2.

pactl, parec and paplay commands trying to create the /run/user/[0-9]*
which is forbidden by the AppArmor rules due to security reasons.

Fix issues related with running the snap on the target system.

[Matteo Croce (teknoraver)]

review: Needs Fixing

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

FAILED: Continuous integration, rev:76b263a01c1a7ff4b99cc72265d9de57012c1c19
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/469/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/212/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/377/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:76b263a01c1a7ff4b99cc72265d9de57012c1c19
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/470/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/213/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/378/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/472/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/214/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/380/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/473/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/215/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/381/console

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

review: Needs Fixing (continuous-integration)

[Matteo Croce (teknoraver)]

review: Approve

[Simon Fels (morphis)]

LGTM, but we need to wait until the CI is fixed.

[Simon Fels (morphis)]

review: Approve

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/477/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/219/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/385/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/481/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/223/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/389/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/484/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/226/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/392/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/497/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/235/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/405/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:926844517a1ba6f33d0e637d9a481b43bca9bfc2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/498/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/236
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/406/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:926844517a1ba6f33d0e637d9a481b43bca9bfc2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/499/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/237
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/407/console

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/500/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/238/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/408/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:926844517a1ba6f33d0e637d9a481b43bca9bfc2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/501/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/239/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/409/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:60fd5ccfc31cee9ba045a56110a9675ebd61d346
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/502/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/240/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/410/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:926844517a1ba6f33d0e637d9a481b43bca9bfc2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/503/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/241/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/411/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:926844517a1ba6f33d0e637d9a481b43bca9bfc2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/504/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/242/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/412/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:926844517a1ba6f33d0e637d9a481b43bca9bfc2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/506/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/243/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/414/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:926844517a1ba6f33d0e637d9a481b43bca9bfc2
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/511/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/247/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/419/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

The problem the CI sees here

Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:

The following packages have unmet dependencies:
 libudev-dev : Depends: libudev1 (= 229-4ubuntu13) but 229-4ubuntu13+ppa1 is to be installed
E: Unable to correct problems, you have held broken packages.

is caused by the ubuntu-image ppa (https://launchpad.net/~snappy-dev/+archive/ubuntu/image/+packages) which has a different version of systemd. 229-4ubuntu13 (xenial-updates) vs. 229-4ubuntu13+ppa1 (ubuntu-image ppa). As 229-4ubuntu13+ppa1 sorts lower than 229-4ubuntu13 but is installed in the rootfs the classic snaps creates this leads to the error seen above.

As we can safely update from 229-4ubuntu13+ppa1 to 229-4ubuntu13 (both include the same fix) and additional

$ apt upgrade --yes --force-yes

in the script should solve this problem.

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

FAILED: Continuous integration, rev:99ba4033b84300248d869c5d311f8c69e07b2a11
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/518/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/254/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/426/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:99ba4033b84300248d869c5d311f8c69e07b2a11
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/519/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/255/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/427/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:ef3646be24685e324559713f643cd335900833ae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/520/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/260/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/428/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:ef3646be24685e324559713f643cd335900833ae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/521/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/261
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/429/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:0792791574a2772161f8f51082ceef5db7885a12
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/522/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/262
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/430/console

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:0792791574a2772161f8f51082ceef5db7885a12
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/523/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/263/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/431/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:0792791574a2772161f8f51082ceef5db7885a12
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/524/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/264
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/432/console

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

review: Approve (continuous-integration)

diff --git a/bin/pactl b/bin/pactl
index ad5e799..97e23b2 100755
--- a/bin/pactl
+++ b/bin/pactl
@@ -14,6 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+if [ $(id -u) -ne 0 ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
 export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
 export HOME=$SNAP_DATA/home
diff --git a/bin/paplay b/bin/paplay
index 4f83d77..a132d51 100755
--- a/bin/paplay
+++ b/bin/paplay
@@ -14,6 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+if [ $(id -u) -ne 0 ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
 export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
 export HOME=$SNAP_DATA/home
diff --git a/bin/parec b/bin/parec
index 0c1cafd..269e0f8 100755
--- a/bin/parec
+++ b/bin/parec
@@ -14,6 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+if [ $(id -u) -ne 0 ]; then
+   echo "This script must be run as root" 1>&2
+   exit 1
+fi
+
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
 export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
 export HOME=$SNAP_DATA/home
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 abb0b5f..8568c89 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -18,13 +18,13 @@ apps:
     slots: [service]
   pactl:
     command: bin/pactl
-    plugs: [client]
+    plugs: [client, network]
   paplay:
     command: bin/paplay
-    plugs: [client,home]
+    plugs: [client, home, network]
   parec:
     command: bin/parec
-    plugs: [client]
+    plugs: [client, home, network]
   config:
     command: bin/config
 
diff --git a/tests/image/create-image.sh b/tests/image/create-image.sh
index e3c36e0..3aa1d13 100755
--- a/tests/image/create-image.sh
+++ b/tests/image/create-image.sh
@@ -21,7 +21,7 @@ if [ $(id -u) -ne 0 ] ; then
 	exit 1
 fi
 
-channel=candidate
+channel=stable
 if [ ! -z "$1" ] ; then
 	channel=$1
 fi
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index e3178fd..a65d357 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -6,12 +6,13 @@ if [ -n "$SNAP_CHANNEL" ] ; then
 	exit 0
 fi
 
-# Setup classic snap and build the network-manager snap in there
+# Setup classic snap and build the pulseaudio snap in there
 snap install --devmode --beta classic
 cat <<-EOF > /home/test/build-snap.sh
 #!/bin/sh
 set -ex
 apt update
+apt upgrade --yes --force-yes
 apt install -y --force-yes snapcraft
 cd /home/pulseaudio
 snapcraft clean
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index 4b360b5..60a45e9 100644
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -31,12 +31,12 @@ if [ -n "$SNAP_CHANNEL" ] ; then
 	echo "USING-CHANNEL"
 else
 	echo "INSTALLING-PULSEAUDIO-SNAP"
-	# Install prebuilt pulseaudio snap
+        # Install prebuilt pulseaudio snap but first install if from
+	# the store to work around the fact that we are not allowed
+	# anymore to connect pulseaudio slot to a snap installed with
+	# --dangerous
+	snap install --beta pulseaudio
 	snap install --dangerous /home/pulseaudio/pulseaudio_*_amd64.snap
-	# As we have a snap which we build locally its unasserted and therefor
-	# we don't have any snap-declarations in place and need to manually
-	# connect all plugs.
-	snap connect pulseaudio:client pulseaudio:service
 fi
 
 # Snapshot of the current snapd state for a later restore