Merge lp:~roadmr/checkbox/1457505 into lp:checkbox

[Daniel Manrique]

providers:checkbox: Fix wrong usage of recovery_info script in some info jobs

providers:checkbox: Fix wrong usage of recovery_info script in some info jobs

This is kinda hard to test (unless you're on a system with an OEM install which has the recovery partition) but running plainbox dev run for the updated jobs should NO longer yield a message about bad commandline parameters. I tested this on a Dell system which has an HP image installed so it was a bit flaky but the non-dell-dependent parts worked fine.

[Zygmunt Krynicki (zyga)]

Looks good

review: Approve

[Sylvain Pineau (sylvain-pineau)]

Thanks for the quick fix.+1

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/jobs/info.txt.in'
--- providers/plainbox-provider-checkbox/jobs/info.txt.in	2015-05-20 10:11:59 +0000
+++ providers/plainbox-provider-checkbox/jobs/info.txt.in	2015-05-21 15:12:29 +0000
@@ -283,7 +283,7 @@
 estimated_duration: 0.2
 _summary: Check existence of recovery partition
 _description: Check existence of recovery partition
-command: recovery_info --check-recovery-partition
+command: recovery_info
 
 plugin: shell
 id: info/detect_dell_recovery
@@ -293,7 +293,7 @@
 estimated_duration: 0.2
 _summary: Check the recovery type is dell or not
 _description: Check the recovery type is dell or not
-command: recovery_info --check-recovery-type DELL
+command: recovery_info checktype DELL
 
 plugin: attachment
 id: recovery_info_attachment
@@ -309,7 +309,7 @@
  Example:
  image_version: somerville-trusty-amd64-20140620-0
  bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
-command: recovery_info --show-version
+command: recovery_info version
 
 plugin: attachment
 id: dell_bto_xml_attachment
@@ -322,7 +322,7 @@
  The information include:
   - fish packages
   - dell recovery stage 2 boot log
-command: recovery_info --readfile bto.xml
+command: recovery_info file bto.xml
 
 plugin: attachment
 id: info/kvm_output