summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2018-01-27 18:47:06 +0000
committerPMR <pmr@pmr-lander>2018-01-27 18:47:06 +0000
commit7f9f7c07b9099fe998993edbbdb434344dc665b7 (patch)
treef7b2db4aaaa693519e274397c6b7e8d6812cdfa4
parente6723a4f4cf287567a6fb1ebc3c44d9b7b27f46e (diff)
parentb1478785790bf466f902200d5925138d21aeb300 (diff)
Merge #336438 from ~sylvain-pineau/plainbox-provider-checkbox:dev_parse_no_plainbox
-rw-r--r--units/submission/jobs.pxu14
-rw-r--r--units/submission/packaging.pxu4
2 files changed, 7 insertions, 11 deletions
diff --git a/units/submission/jobs.pxu b/units/submission/jobs.pxu
index 4c929b0..a21c897 100644
--- a/units/submission/jobs.pxu
+++ b/units/submission/jobs.pxu
@@ -4,7 +4,7 @@ category_id: com.canonical.plainbox::info
requires:
package.name == 'dkms'
command:
- dkms_info --format json | plainbox dev parse dkms-info | \
+ dkms_info --format json | python3 -m plainbox dev parse dkms-info | \
jq --indent 4 '.dkms_info'
_description: Attaches json dumps of installed dkms package information.
_summary: Attaches json dumps of installed dkms package information.
@@ -12,7 +12,7 @@ _summary: Attaches json dumps of installed dkms package information.
id: udev_json
plugin: attachment
category_id: com.canonical.plainbox::info
-command: udevadm info --export-db | plainbox dev parse udevadm
+command: udevadm info --export-db | python3 -m plainbox dev parse udevadm
_description: Attaches json dumps of udev_resource
id: raw_devices_dmi_json
@@ -23,7 +23,7 @@ requires:
dmi_present.state == 'supported'
user: root
command:
- dmidecode -t bios -t system | plainbox dev parse dmidecode | \
+ dmidecode -t bios -t system | python3 -m plainbox dev parse dmidecode | \
jq --indent 4 '[.[0]."_attributes" +
{"category": .[0]."category"}, .[1]."_attributes" +
{"category": .[1]."category"}]'
@@ -35,7 +35,7 @@ id: modprobe_json
plugin: attachment
category_id: com.canonical.plainbox::info
command:
- find /etc/modprobe.* -name \*.conf | xargs cat | plainbox dev parse modprobe |
+ find /etc/modprobe.* -name \*.conf | xargs cat | python3 -m plainbox dev parse modprobe |
jq --indent 4 'to_entries | map({"module": .key, "options": .value})'
estimated_duration: 0.015
_description: Attaches the contents of the various modprobe conf files.
@@ -46,7 +46,7 @@ _summary: Attach PCI configuration space hex dump
plugin: attachment
category_id: com.canonical.plainbox::info
command:
- lspci -x | plainbox dev parse pci-subsys-id | \
+ lspci -x | python3 -m plainbox dev parse pci-subsys-id | \
jq --indent 4 '.pci_subsystem_id'
estimated_duration: 0.1
_description: Attaches a hex dump of the standard part of the PCI configuration
@@ -65,7 +65,7 @@ _description:
The information include:
- fish packages
- dell recovery stage 2 boot log
-command: recovery_info file bto.xml | plainbox dev parse bto
+command: recovery_info file bto.xml | python3 -m plainbox dev parse bto
id: recovery_info_attachment_json
plugin: attachment
@@ -82,4 +82,4 @@ _description:
Example:
image_version: somerville-trusty-amd64-20140620-0
bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
-command: recovery_info version | plainbox dev parse recovery-info
+command: recovery_info version | python3 -m plainbox dev parse recovery-info
diff --git a/units/submission/packaging.pxu b/units/submission/packaging.pxu
index ce8cc1c..d293608 100644
--- a/units/submission/packaging.pxu
+++ b/units/submission/packaging.pxu
@@ -1,7 +1,3 @@
unit: packaging meta-data
os-id: debian
Depends: jq
-
-unit: packaging meta-data
-os-id: debian
-Depends: plainbox