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

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 339a6b82c979622c4e523454f8944f67cbedb464
Merged at revision: 8cdb5b412cce7715efabb79fefff2092d38c2202
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:new_json_exporter_2
Merge into: plainbox-provider-checkbox:master
Diff against target: 53 lines (+34/-0)
2 files modified
jobs/miscellanea.txt.in (+2/-0)
jobs/submission.txt.in (+32/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+309661@code.launchpad.net

Description of the change

2 new attachments jobs in json format meant to be used by the submission report.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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:
18 raw_devices_dmi_json18 raw_devices_dmi_json
19 modprobe_json19 modprobe_json
20 lspci_standard_config_json20 lspci_standard_config_json
21 dell_bto_xml_attachment_json
22 recovery_info_attachment_json
21estimated_duration: 1.023estimated_duration: 1.0
22command: true24command: true
23_summary:25_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
52estimated_duration: 0.152estimated_duration: 0.1
53_description: Attaches a hex dump of the standard part of the PCI configuration53_description: Attaches a hex dump of the standard part of the PCI configuration
54 space for all PCI devices.54 space for all PCI devices.
55
56id: dell_bto_xml_attachment_json
57plugin: attachment
58category_id: 2013.com.canonical.plainbox::info
59depends: info/detect_dell_recovery
60requires: package.name == 'dell-recovery'
61user: root
62estimated_duration: 0.5
63_summary: Attach the bto.xml in Dell recovery partition
64_description:
65 bto.xml is basically a Fish manifest
66 The information include:
67 - fish packages
68 - dell recovery stage 2 boot log
69command: recovery_info file bto.xml | plainbox dev parse bto
70
71id: recovery_info_attachment_json
72plugin: attachment
73category_id: 2013.com.canonical.plainbox::info
74depends: info/detect_recovery
75requires: package.name == 'dell-recovery' or package.name == 'ubuntu-recovery'
76user: root
77estimated_duration: 0.2
78_summary: Attach the recovery partition versions
79_description:
80 Attach the recovery partition version
81 image_version is the preinstalled OS image version
82 bto_version is only for dell_recovery
83 Example:
84 image_version: somerville-trusty-amd64-20140620-0
85 bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
86command: recovery_info version | plainbox dev parse recovery-info

Subscribers

People subscribed via source and target branches