snappy-hwe-snaps

Merge ~ogra/snappy-hwe-snaps/+git/pulseaudio:add-network-bind into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

  1. Git
  2. lp:~ogra/snappy-hwe-snaps/+git/pulseaudio
  3. add-network-bind
  4. Merge into master
Proposed by Oliver Grawert
Status: Rejected
Rejected by: Oliver Grawert
Proposed branch: ~ogra/snappy-hwe-snaps/+git/pulseaudio:add-network-bind
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
Diff against target: 95 lines (+26/-12)
3 files modified
snapcraft.yaml (+25/-8)
tests/lib/prepare.sh (+0/-3)
tests/lib/restore-each.sh (+1/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Needs Fixing
Alfonso Sanchez-Beato Approve
Review via email: mp+373452@code.launchpad.net

Commit message

for pulse modules allowing network based playback and streaming we need the network-bind plug for the pulseaudio binary to allow socket creation, see:

https://forum.snapcraft.io/t/pulseaudio-snap-does-not-have-network-plug/13474

also move to "base: core" and adjust snapcraft.yaml for this change

Description of the change

for pulse modules allowing network based playback and streaming we need the network-bind plug for the pulseaudio binary to allow socket creation, see:

https://forum.snapcraft.io/t/pulseaudio-snap-does-not-have-network-plug/13474

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

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

PASSED: Successfully build documentation, rev: 3d9c8d055e827f8a873a6bc17140a5203fcfa382

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

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

FAILED: Continuous integration, rev:3d9c8d055e827f8a873a6bc17140a5203fcfa382
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/436/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/468/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/468
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/468
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/468
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1260
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1002
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1049/console

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

review: Needs Fixing (continuous-integration)
~ogra/snappy-hwe-snaps/+git/pulseaudio:add-network-bind updated
4fac4de... by Oliver Grawert

drop unapplicable test

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

PASSED: Successfully build documentation, rev: 4fac4de6af7d3da7fdec5a645262e7cdbec9e533

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

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

FAILED: Continuous integration, rev:4fac4de6af7d3da7fdec5a645262e7cdbec9e533
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/437/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/469/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/469
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/469
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/469
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1261
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1003
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1050/console

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

review: Needs Fixing (continuous-integration)
~ogra/snappy-hwe-snaps/+git/pulseaudio:add-network-bind updated
574a89e... by Oliver Grawert

force "base: core" so we dont use core18

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

PASSED: Successfully build documentation, rev: 574a89e7be666c48711906d3761166adfacb52e4

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

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

FAILED: Continuous integration, rev:574a89e7be666c48711906d3761166adfacb52e4
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/438/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/470/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/470/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/470/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/470/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1262
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1004
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1051/console

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

review: Needs Fixing (continuous-integration)
~ogra/snappy-hwe-snaps/+git/pulseaudio:add-network-bind updated
81c0b8a... by Oliver Grawert

replace copy plugin, it got dropped from snapcraft

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

PASSED: Successfully build documentation, rev: 81c0b8af1a1d6df390a979acf186662859535caf

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

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

FAILED: Continuous integration, rev:81c0b8af1a1d6df390a979acf186662859535caf
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/439/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/471/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/471/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/471/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/471/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1263
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1005
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1052/console

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

review: Needs Fixing (continuous-integration)
~ogra/snappy-hwe-snaps/+git/pulseaudio:add-network-bind updated
c1f0264... by Oliver Grawert

filesets do not support the snap target anymore, needs to be stage

1f9fb7c... by Oliver Grawert

make sure the binaries we want to copy have been built, add "after: pulseaudio" to pulseaudio-common

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

PASSED: Successfully build documentation, rev: c1f02643d7510d040b15a65de9d3e545be7ae1c2

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

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

FAILED: Continuous integration, rev:c1f02643d7510d040b15a65de9d3e545be7ae1c2
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/440/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/472/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/472/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/472/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/472/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1264
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1006
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1053/console

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

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

PASSED: Successfully build documentation, rev: 1f9fb7c6cdbb89320a13e542d042ec06e6b11260

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

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

FAILED: Continuous integration, rev:1f9fb7c6cdbb89320a13e542d042ec06e6b11260
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/441/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/473/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/473/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/473/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/473/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1265
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1007
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1054/console

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

review: Needs Fixing (continuous-integration)
~ogra/snappy-hwe-snaps/+git/pulseaudio:add-network-bind updated
3c744cb... by Oliver Grawert

add proper "source:" entry for pulseaudio-common, drop "after:", fis test even more

802ac0b... by Oliver Grawert

use mkdir -p so manual re-builds do not fail

adb61eb... by Oliver Grawert

new snapcraft does not automatically stage dependencies, add a proper list of stage-packages to pulseaudio part

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

PASSED: Successfully build documentation, rev: 802ac0b025ff2cb2e6b9b5c4d5fd302ba11f19fb

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

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

FAILED: Continuous integration, rev:802ac0b025ff2cb2e6b9b5c4d5fd302ba11f19fb
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/442/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/474/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/474
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/474
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/474
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1266
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1008
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1055/console

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

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

PASSED: Successfully build documentation, rev: adb61eb102487a7a84ca74d992186c0e365d3fd9

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

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

FAILED: Continuous integration, rev:adb61eb102487a7a84ca74d992186c0e365d3fd9
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/443/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/475/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/475
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/475
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/475
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1267
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1009
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1056/console

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

review: Needs Fixing (continuous-integration)

Unmerged commits

adb61eb... by Oliver Grawert

new snapcraft does not automatically stage dependencies, add a proper list of stage-packages to pulseaudio part

802ac0b... by Oliver Grawert

use mkdir -p so manual re-builds do not fail

3c744cb... by Oliver Grawert

add proper "source:" entry for pulseaudio-common, drop "after:", fis test even more

1f9fb7c... by Oliver Grawert

make sure the binaries we want to copy have been built, add "after: pulseaudio" to pulseaudio-common

c1f0264... by Oliver Grawert

filesets do not support the snap target anymore, needs to be stage

81c0b8a... by Oliver Grawert

replace copy plugin, it got dropped from snapcraft

574a89e... by Oliver Grawert

force "base: core" so we dont use core18

4fac4de... by Oliver Grawert

drop unapplicable test

3d9c8d0... by Oliver Grawert

add network and network-bind to pulseaudio, so plugins using network audio can create sockets

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index b4bf686..abbaea5 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -10,11 +10,13 @@ description: |
6 https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
7 grade: stable
8 confinement: strict
9+base: core
10
11 apps:
12 pulseaudio:
13 command: bin/pulseaudio
14 daemon: simple
15+ plugs: [network, network-bind]
16 slots: [service]
17 pactl:
18 command: bin/client-wrapper usr/bin/pactl
19@@ -47,12 +49,15 @@ plugs:
20
21 parts:
22 pulseaudio-common:
23- plugin: copy
24- files:
25- bin/pulseaudio: bin/pulseaudio
26- bin/client-wrapper: bin/client-wrapper
27- bin/config: bin/config
28- data/copyright: usr/share/doc/pulseaudio/copyright
29+ source: .
30+ plugin: nil
31+ override-build: |
32+ mkdir -p $SNAPCRAFT_PART_INSTALL/bin
33+ mkdir -p $SNAPCRAFT_PART_INSTALL/usr/share/doc/pulseaudio
34+ for binfile in pulseaudio client-wrapper config; do
35+ cp -av bin/$binfile $SNAPCRAFT_PART_INSTALL/bin/
36+ done
37+ cp -av data/copyright $SNAPCRAFT_PART_INSTALL/usr/share/doc/pulseaudio/
38
39 alsa-lib:
40 plugin: autotools
41@@ -78,7 +83,7 @@ parts:
42 - usr/lib/alsa-lib/*
43 - usr/share/alsa/*
44
45- snap:
46+ stage:
47 - $libasound2
48
49
50@@ -152,5 +157,17 @@ parts:
51 - usr/lib/pulseaudio/*.so
52 - usr/share/pulseaudio/*
53
54- snap:
55+ stage:
56 - $wanted
57+
58+ stage-packages:
59+ - libasyncns0
60+ - libflac8
61+ - libltdl7
62+ - libogg0
63+ - libsbc1
64+ - libsndfile1
65+ - libspeexdsp1
66+ - libtdb1
67+ - libvorbis0a
68+ - libvorbisenc2
69diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
70index e14a9b2..7f0791e 100644
71--- a/tests/lib/prepare.sh
72+++ b/tests/lib/prepare.sh
73@@ -20,9 +20,6 @@ for name in $gadget_name $kernel_name $core_name; do
74 fi
75 done
76
77-echo "Kernel has a store revision"
78-snap list | grep ^${kernel_name} | grep -E " [0-9]+\s+canonical"
79-
80 install_snap_under_test
81
82 # Snapshot of the current snapd state for a later restore
83diff --git a/tests/lib/restore-each.sh b/tests/lib/restore-each.sh
84index 541ba8c..1d6d412 100644
85--- a/tests/lib/restore-each.sh
86+++ b/tests/lib/restore-each.sh
87@@ -6,7 +6,7 @@
88 for snap in /snap/*; do
89 snap="${snap:6}"
90 case "$snap" in
91- "bin" | "$gadget_name" | "$kernel_name" | "$core_name" | "$SNAP_NAME")
92+ "bin" | "$gadget_name" | "$kernel_name" | core* | "$SNAP_NAME")
93 ;;
94 *)
95 snap remove "$snap"

Subscribers

People subscribed via source and target branches