Merge checkbox-dragonboard:remove-snapd-integration-tests into checkbox-dragonboard:master

Proposed by Paul Larson
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 8ed98fe2f1fe986fa6f0269211469b5d0a2875fb
Merged at revision: 8ed98fe2f1fe986fa6f0269211469b5d0a2875fb
Proposed branch: checkbox-dragonboard:remove-snapd-integration-tests
Merge into: checkbox-dragonboard:master
Diff against target: 44 lines (+0/-36)
1 file modified
snapcraft.yaml (+0/-36)
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+304950@code.launchpad.net

Description of the change

This should keep it from trying to build the upstream integration tests, which no longer exist in the form they did before.

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

+1

review: Approve

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 af37ca5..e4b04b7 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -37,40 +37,4 @@ parts:
6 - linux-headers-generic
7 plainbox-provider-snappy-resource:
8 after: [plainbox-provider-snappy]
9- plainbox-provider-snapd-tests:
10- plugin: plainbox-provider
11- source-type: git
12- source: git://git.launchpad.net/plainbox-provider-snapd-tests
13- after: [plainbox-provider-snappy-resource]
14- network-tools:
15- plugin: nil
16- stage-packages:
17- - network-manager
18- - modemmanager
19- - hostapd
20- - iw
21- snap:
22- - usr/bin/mmcli
23- - usr/lib/*/libmm-glib.so*
24- - usr/bin/nmcli
25- - usr/lib/*/libnm*
26- - usr/sbin/hostapd
27- - sbin/iw
28- snappy-tests:
29- plugin: x-go-test
30- source-type: git
31- source: https://github.com/snapcore/snapd
32- testdata:
33- plugin: copy
34- source-type: git
35- source: https://github.com/snapcore/snapd
36- files:
37- integration-tests/data/snaps: integration-tests/data/snaps
38- integration-tests/data/dev1.acckey: integration-tests/data/dev1.acckey
39- integration-tests/data/trusted.acckey: integration-tests/data/trusted.acckey
40- testconfig:
41- plugin: copy
42- files:
43- testconfig.json: integration-tests/data/output/testconfig.json
44-
45

Subscribers

People subscribed via source and target branches

to all changes: