summaryrefslogtreecommitdiff
path: root/jobs
diff options
authorSylvain Pineau <sylvain.pineau@canonical.com>2017-04-03 09:36:08 +0200
committerSylvain Pineau <sylvain.pineau@canonical.com>2017-04-03 09:39:22 +0200
commit27e15aaa2aa62da2db5733f01576bdfc296339d1 (patch)
treea5830e4c539e9e6370a21682bd422d3aa922e927 /jobs
parentd3f056cf1edb1f504fbd81e75513154b343ef4bc (diff)
jobs:submission.txt: Update json attachment jobs to drop the main key
The new tarball submission format will now contain a json export based on dicts (and not a dict of list of dict...)
Diffstat (limited to 'jobs')
-rw-r--r--jobs/submission.txt.in15
1 files changed, 9 insertions, 6 deletions
diff --git a/jobs/submission.txt.in b/jobs/submission.txt.in
index fcd61e6..0fafa85 100644
--- a/jobs/submission.txt.in
+++ b/jobs/submission.txt.in
@@ -1,7 +1,9 @@
id: dkms_info_json
plugin: attachment
category_id: 2013.com.canonical.plainbox::info
-command: dkms_info --format json | plainbox dev parse dkms-info
+command:
+ dkms_info --format json | 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.
@@ -26,9 +28,9 @@ requires: package.name == 'dmidecode'
user: root
command:
dmidecode -t bios -t system | plainbox dev parse dmidecode | \
- jq --indent 4 '{"raw-devices-dmi": [.[0]."_attributes" +
+ jq --indent 4 '[.[0]."_attributes" +
{"category": .[0]."category"}, .[1]."_attributes" +
- {"category": .[1]."category"}]}'
+ {"category": .[1]."category"}]'
estimated_duration: 1
_description: Attaches dmidecode output
_summary: Attaches json dumps of udev_resource raw dmi devices
@@ -38,8 +40,7 @@ plugin: attachment
category_id: 2013.com.canonical.plainbox::info
command:
find /etc/modprobe.* -name \*.conf | xargs cat | plainbox dev parse modprobe |
- jq --indent 4 'to_entries | {"modprobe-info":
- map({"module": .key, "options": .value})}'
+ jq --indent 4 'to_entries | map({"module": .key, "options": .value})'
estimated_duration: 0.015
_description: Attaches the contents of the various modprobe conf files.
_summary: Attach the contents of /etc/modprobe.*
@@ -48,7 +49,9 @@ id: lspci_standard_config_json
_summary: Attach PCI configuration space hex dump
plugin: attachment
category_id: 2013.com.canonical.plainbox::info
-command: lspci -x | plainbox dev parse pci-subsys-id
+command:
+ lspci -x | 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
space for all PCI devices.