snappy-hwe-snaps

Merge ~kzapalowicz/snappy-hwe-snaps/+git/bluez:feature/btmon into ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master

  1. Git
  2. lp:~kzapalowicz/snappy-hwe-snaps/+git/bluez
  3. feature/btmon
  4. Merge into master
Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Simon Fels
Approved revision: fa891cbfb34939ead52daf9755cbee0d6287ffae
Merged at revision: e54682f1622593699c6efa9f425302d537309f20
Proposed branch: ~kzapalowicz/snappy-hwe-snaps/+git/bluez:feature/btmon
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master
Diff against target: 41 lines (+7/-2)
1 file modified
snapcraft.yaml (+7/-2)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Simon Fels Approve
Review via email: mp+319572@code.launchpad.net

Description of the change

add btmon HCI sniffer and fix denials when using
btmon and hcidump.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:fa891cbfb34939ead52daf9755cbee0d6287ffae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1285/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/374/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1193/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1028/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/40/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM but something with the tests seems to be wrong.

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

FAILED: Continuous integration, rev:34c00131b90797ea362875bbe7dbf56ff5d84066
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1301/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/470/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1209/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1115/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/132/console

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

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

PASSED: Continuous integration, rev:fa891cbfb34939ead52daf9755cbee0d6287ffae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1304/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/473
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1212/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1118
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/135/console

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

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

PASSED: Continuous integration, rev:a123b6ce40d439
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1305/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/474
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1213/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1119
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/136

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

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

PASSED: Continuous integration, rev:fa891cbfb34939ead52daf9755cbee0d6287ffae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1306/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/475
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1214/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1120
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/137/console

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snapcraft.yaml b/snapcraft.yaml
index fc24530..70ed732 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -37,7 +37,7 @@ apps:
37 - hciconfig37 - hciconfig
38 hcidump:38 hcidump:
39 command: usr/bin/hcidump39 command: usr/bin/hcidump
40 plugs: [bluetooth-control]40 plugs: [bluetooth-control, network-control]
41 aliases:41 aliases:
42 - hcidump42 - hcidump
43 hciattach:43 hciattach:
@@ -55,6 +55,11 @@ apps:
55 plugs: [client]55 plugs: [client]
56 aliases:56 aliases:
57 - sdptool57 - sdptool
58 btmon:
59 command: usr/bin/btmon
60 plugs: [bluetooth-control, network-control]
61 aliases:
62 - btmon
5863
59plugs:64plugs:
60 client:65 client:
@@ -75,7 +80,6 @@ parts:
75 - --enable-experimental80 - --enable-experimental
76 - --enable-threads81 - --enable-threads
77 - --disable-cups82 - --disable-cups
78 - --disable-monitor
79 - --enable-obex83 - --enable-obex
80 - --disable-systemd84 - --disable-systemd
81 - --disable-silent-rules85 - --disable-silent-rules
@@ -103,6 +107,7 @@ parts:
103 - usr/bin/hciattach107 - usr/bin/hciattach
104 - usr/bin/hcitool108 - usr/bin/hcitool
105 - usr/bin/sdptool109 - usr/bin/sdptool
110 - usr/bin/btmon
106 - usr/share/doc/libical1a/copyright111 - usr/share/doc/libical1a/copyright
107 - $libical1a112 - $libical1a
108 install: |113 install: |

Subscribers

People subscribed via source and target branches