Merge ~sylvain-pineau/plainbox-provider-checkbox:dev_parse_no_plainbox into plainbox-provider-checkbox:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: b1478785790bf466f902200d5925138d21aeb300
Merged at revision: 7f9f7c07b9099fe998993edbbdb434344dc665b7
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:dev_parse_no_plainbox
Merge into: plainbox-provider-checkbox:master
Diff against target: 76 lines (+7/-11)
2 files modified
units/submission/jobs.pxu (+7/-7)
units/submission/packaging.pxu (+0/-4)
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Jonathan Cave (community) Approve
Paul Larson Approve
Review via email: mp+336438@code.launchpad.net

Description of the change

Stop using plainbox cli tool for parsing resource output and translate them into json and prefer python3 -m plainbox instead.

Requires https://code.launchpad.net/~sylvain-pineau/checkbox-ng/+git/checkbox-ng/+merge/336417

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

lgtm

review: Approve
Revision history for this message
Jonathan Cave (jocave) wrote :

Nice

review: Approve
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/units/submission/jobs.pxu b/units/submission/jobs.pxu
2index 4c929b0..a21c897 100644
3--- a/units/submission/jobs.pxu
4+++ b/units/submission/jobs.pxu
5@@ -4,7 +4,7 @@ category_id: com.canonical.plainbox::info
6 requires:
7 package.name == 'dkms'
8 command:
9- dkms_info --format json | plainbox dev parse dkms-info | \
10+ dkms_info --format json | python3 -m plainbox dev parse dkms-info | \
11 jq --indent 4 '.dkms_info'
12 _description: Attaches json dumps of installed dkms package information.
13 _summary: Attaches json dumps of installed dkms package information.
14@@ -12,7 +12,7 @@ _summary: Attaches json dumps of installed dkms package information.
15 id: udev_json
16 plugin: attachment
17 category_id: com.canonical.plainbox::info
18-command: udevadm info --export-db | plainbox dev parse udevadm
19+command: udevadm info --export-db | python3 -m plainbox dev parse udevadm
20 _description: Attaches json dumps of udev_resource
21
22 id: raw_devices_dmi_json
23@@ -23,7 +23,7 @@ requires:
24 dmi_present.state == 'supported'
25 user: root
26 command:
27- dmidecode -t bios -t system | plainbox dev parse dmidecode | \
28+ dmidecode -t bios -t system | python3 -m plainbox dev parse dmidecode | \
29 jq --indent 4 '[.[0]."_attributes" +
30 {"category": .[0]."category"}, .[1]."_attributes" +
31 {"category": .[1]."category"}]'
32@@ -35,7 +35,7 @@ id: modprobe_json
33 plugin: attachment
34 category_id: com.canonical.plainbox::info
35 command:
36- find /etc/modprobe.* -name \*.conf | xargs cat | plainbox dev parse modprobe |
37+ find /etc/modprobe.* -name \*.conf | xargs cat | python3 -m plainbox dev parse modprobe |
38 jq --indent 4 'to_entries | map({"module": .key, "options": .value})'
39 estimated_duration: 0.015
40 _description: Attaches the contents of the various modprobe conf files.
41@@ -46,7 +46,7 @@ _summary: Attach PCI configuration space hex dump
42 plugin: attachment
43 category_id: com.canonical.plainbox::info
44 command:
45- lspci -x | plainbox dev parse pci-subsys-id | \
46+ lspci -x | python3 -m plainbox dev parse pci-subsys-id | \
47 jq --indent 4 '.pci_subsystem_id'
48 estimated_duration: 0.1
49 _description: Attaches a hex dump of the standard part of the PCI configuration
50@@ -65,7 +65,7 @@ _description:
51 The information include:
52 - fish packages
53 - dell recovery stage 2 boot log
54-command: recovery_info file bto.xml | plainbox dev parse bto
55+command: recovery_info file bto.xml | python3 -m plainbox dev parse bto
56
57 id: recovery_info_attachment_json
58 plugin: attachment
59@@ -82,4 +82,4 @@ _description:
60 Example:
61 image_version: somerville-trusty-amd64-20140620-0
62 bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
63-command: recovery_info version | plainbox dev parse recovery-info
64+command: recovery_info version | python3 -m plainbox dev parse recovery-info
65diff --git a/units/submission/packaging.pxu b/units/submission/packaging.pxu
66index ce8cc1c..d293608 100644
67--- a/units/submission/packaging.pxu
68+++ b/units/submission/packaging.pxu
69@@ -1,7 +1,3 @@
70 unit: packaging meta-data
71 os-id: debian
72 Depends: jq
73-
74-unit: packaging meta-data
75-os-id: debian
76-Depends: plainbox

Subscribers

People subscribed via source and target branches