Merge ~alextu/plainbox-provider-pc-sanity:check-dell-recovery-ver into plainbox-provider-pc-sanity:master

[Alex Tu]

    check dell-recovery version based on the meeting conclusion of 4/22 meeting

    This test case is to prevent the case that the dell-recovery in Ubuntu
    archive override the one in oem image unexpectly.

    But the issue could be fixed if Canonical own the duty of dell-reocvery
    SRU. So, this case is here before the change of duty happens.

[Shih-Yuan Lee (fourdollars)]

Make sure dell-recovery is installed.

review: Needs Fixing

[Shih-Yuan Lee (fourdollars)]

LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 91a3d8c..582ed92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plainbox-provider-pc-sanity (0.2.6ubuntu2) UNRELEASED; urgency=medium
+
+  * based on the meeting conclusion of 4/22, we need somerville version.
+
+ -- Alex Tu <[e-mail]>  Wed, 22 Apr 2020 14:18:07 +0800
+
 plainbox-provider-pc-sanity (0.2.6ubuntu1) bionic; urgency=medium
 
   * bump version
diff --git a/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-check-env.pxu b/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-check-env.pxu
new file mode 100644
index 0000000..98f2a60
--- /dev/null
+++ b/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-check-env.pxu
@@ -0,0 +1,10 @@
+plugin: shell
+category_id: com.canonical.plainbox::miscellanea
+id: miscellanea/check_dell_recovery_version
+requires: package.name == 'dell-recovery'
+command:
+ set -x
+ dpkg -l | grep dell-recovery | grep ^ii | awk '{print $3}' | grep -q somerville
+_summary: to confirm the dell-recoery is what we expected.
+_description:
+ based on the meeting conclusion of 4/22, we need somerville version before Mario agree Canonical take the duty of dell-recovery sru.
diff --git a/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-smoke-test.pxu b/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-smoke-test.pxu
index 42d14e7..64c9df8 100644
--- a/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-smoke-test.pxu
+++ b/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-smoke-test.pxu
@@ -9,6 +9,7 @@ include:
     com.canonical.certification::miscellanea/dump_libsmbios_tokens
     com.canonical.certification::miscellanea/dump_libsmbios_tokens_attachment
     com.canonical.certification::miscellanea/check_i2c_hid
+    com.canonical.certification::miscellanea/check_dell_recovery_version
 nested_part:
     com.canonical.certification::client-cert-auto
 bootstrap_include: