snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/bluez:add-changelog into ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/bluez
  3. add-changelog
  4. Merge into master
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Konrad Zapałowicz
Approved revision: 7313755bde5a50865ec13fd5670d2608211350cd
Merged at revision: a294fc851ff9ceac75db4d016b56019792b595c4
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/bluez:add-changelog
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:master
Diff against target: 65 lines (+13/-10)
2 files modified
snapcraft.yaml (+12/-9)
tests/lib/restore-each.sh (+1/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Konrad Zapałowicz (community) code Approve
Review via email: mp+372528@code.launchpad.net

Commit message

snap: copy changelog to package

Description of the change

snap: copy changelog to package

To post a comment you must log in.
Revision history for this message
Konrad Zapałowicz (kzapalowicz) :
review: Approve (code)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 7313755bde5a50865ec13fd5670d2608211350cd

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

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

FAILED: Continuous integration, rev:7313755bde5a50865ec13fd5670d2608211350cd
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/427/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/459/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/459/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/459/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/459/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1249
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/991
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1038/console

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

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

PASSED: Successfully build documentation, rev: a2f1f281ae14c6f1711fe2eec63f6ca0429fe60c

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

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

FAILED: Continuous integration, rev:a2f1f281ae14c6f1711fe2eec63f6ca0429fe60c
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/429/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/461/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/461/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/461/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/461/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1252
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/994
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1041/console

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

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

PASSED: Successfully build documentation, rev: a2f1f281ae14c6f1711fe2eec63f6ca0429fe60c

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

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

FAILED: Continuous integration, rev:a2f1f281ae14c6f1711fe2eec63f6ca0429fe60c
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/430/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/462/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/462/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/462/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/462/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1253
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/995
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1042/console

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

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

PASSED: Successfully build documentation, rev: e22da78e617cf9cf79f8b365fc1f1ab79b78c1f6

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

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

FAILED: Continuous integration, rev:e22da78e617cf9cf79f8b365fc1f1ab79b78c1f6
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/432/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/464/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/464/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/464/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/464/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1255
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/997
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1044/console

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

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

PASSED: Successfully build documentation, rev: a65da6332d083ba40392190c7767408c7f2e6d32

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

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

PASSED: Continuous integration, rev:a65da6332d083ba40392190c7767408c7f2e6d32
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/434/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/466
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/466
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/466
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/466
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1258
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1000
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1047/console

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

review: Approve (continuous-integration)

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 258bb16..e91f189 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -10,6 +10,7 @@ description: |
6 https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/bluez
7 confinement: strict
8 grade: stable
9+base: core
10
11 apps:
12 bluetoothctl:
13@@ -68,6 +69,14 @@ parts:
14 source: bin/
15 organize:
16 client-wrapper: bin/client-wrapper
17+ changelog:
18+ plugin: nil
19+ override-build: |
20+ cp "$SNAPCRAFT_PROJECT_DIR"/copyright "$SNAPCRAFT_PART_INSTALL"
21+ cp "$SNAPCRAFT_PROJECT_DIR"/ChangeLog "$SNAPCRAFT_PART_INSTALL"
22+ organize:
23+ copyright: usr/share/doc/bluez/copyright
24+ ChangeLog: usr/share/doc/bluez/ChangeLog
25 bluez:
26 plugin: autotools
27 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/bluez
28@@ -99,7 +108,7 @@ parts:
29 filesets:
30 libical1a:
31 - usr/lib/*/libical*
32- snap:
33+ prime:
34 - usr/lib/bluetooth/bluetoothd
35 - usr/lib/bluetooth/obexd
36 - usr/bin/bluetoothctl
37@@ -115,13 +124,7 @@ parts:
38 - usr/bin/meshctl
39 - usr/share/doc/libical1a/copyright
40 - $libical1a
41- install: |
42+ override-build: |
43+ snapcraftctl build
44 # Run all tests shiped by default
45 make check
46-
47- common:
48- plugin: dump
49- organize:
50- copyright: usr/share/doc/bluez/copyright
51- prime:
52- - usr/share/doc/bluez/copyright
53diff --git a/tests/lib/restore-each.sh b/tests/lib/restore-each.sh
54index 541ba8c..1d6d412 100644
55--- a/tests/lib/restore-each.sh
56+++ b/tests/lib/restore-each.sh
57@@ -6,7 +6,7 @@
58 for snap in /snap/*; do
59 snap="${snap:6}"
60 case "$snap" in
61- "bin" | "$gadget_name" | "$kernel_name" | "$core_name" | "$SNAP_NAME")
62+ "bin" | "$gadget_name" | "$kernel_name" | core* | "$SNAP_NAME")
63 ;;
64 *)
65 snap remove "$snap"

Subscribers

People subscribed via source and target branches