From b3f24fb38ac39af2a93399556f622db0216577a5 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Mon, 2 Apr 2018 10:13:50 +0200
Subject: Import plainbox-provider-checkbox_0.43.0.orig.tar_gz

---
 units/submission/jobs.pxu | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'units/submission')

diff --git a/units/submission/jobs.pxu b/units/submission/jobs.pxu
index a21c897..f6f73bc 100644
--- a/units/submission/jobs.pxu
+++ b/units/submission/jobs.pxu
@@ -1,11 +1,9 @@
 id: dkms_info_json
 plugin: attachment
 category_id: com.canonical.plainbox::info
-requires:
- package.name == 'dkms'
 command:
  dkms_info  --format json | python3 -m plainbox dev parse dkms-info | \
- jq --indent 4 '.dkms_info'
+ jq '.dkms_info'
 _description: Attaches json dumps of installed dkms package information.
 _summary: Attaches json dumps of installed dkms package information.
 
@@ -24,9 +22,9 @@ requires:
 user: root
 command:
  dmidecode -t bios -t system | python3 -m plainbox dev parse dmidecode | \
- jq --indent 4 '[.[0]."_attributes" +
-                {"category": .[0]."category"}, .[1]."_attributes" +
-                {"category": .[1]."category"}]'
+ jq '[.[0]."_attributes" +
+     {"category": .[0]."category"}, .[1]."_attributes" +
+     {"category": .[1]."category"}]'
 estimated_duration: 1
 _description: Attaches dmidecode output
 _summary: Attaches json dumps of udev_resource raw dmi devices
@@ -36,7 +34,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 command:
  find /etc/modprobe.* -name \*.conf | xargs cat | python3 -m plainbox dev parse modprobe |
- jq --indent 4 'to_entries | map({"module": .key, "options": .value})'
+ jq '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.*
@@ -47,7 +45,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 command:
  lspci -x | python3 -m plainbox dev parse pci-subsys-id | \
- jq --indent 4 '.pci_subsystem_id'
+ jq '.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.
-- 
cgit v1.2.3