Merge #309661 from ~sylvain-pineau/plainbox-provider-checkbox:new_json_exporter_2

2 files changed, 34 insertions, 0 deletions

diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in
index 882838b..b5544c2 100644
--- a/jobs/miscellanea.txt.in
+++ b/jobs/miscellanea.txt.in
@@ -18,6 +18,8 @@ depends:
 raw_devices_dmi_json
 modprobe_json
 lspci_standard_config_json
+ dell_bto_xml_attachment_json
+ recovery_info_attachment_json
 estimated_duration: 1.0
 command: true
 _summary:
diff --git a/jobs/submission.txt.in b/jobs/submission.txt.in
index 9851d3a..fcd61e6 100644
--- a/jobs/submission.txt.in
+++ b/jobs/submission.txt.in
@@ -52,3 +52,35 @@ command: lspci -x | plainbox dev parse pci-subsys-id
 estimated_duration: 0.1
 _description: Attaches a hex dump of the standard part of the PCI configuration
 space for all PCI devices.
+
+id: dell_bto_xml_attachment_json
+plugin: attachment
+category_id: 2013.com.canonical.plainbox::info
+depends: info/detect_dell_recovery
+requires: package.name == 'dell-recovery'
+user: root
+estimated_duration: 0.5
+_summary: Attach the bto.xml in Dell recovery partition
+_description:
+ bto.xml is basically a Fish manifest
+ The information include:
+ - fish packages
+ - dell recovery stage 2 boot log
+command: recovery_info file bto.xml | plainbox dev parse bto
+
+id: recovery_info_attachment_json
+plugin: attachment
+category_id: 2013.com.canonical.plainbox::info
+depends: info/detect_recovery
+requires: package.name == 'dell-recovery' or package.name == 'ubuntu-recovery'
+user: root
+estimated_duration: 0.2
+_summary: Attach the recovery partition versions
+_description:
+ Attach the recovery partition version
+ image_version is the preinstalled OS image version
+ bto_version is only for dell_recovery
+ 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