Merge ~bettyl/plainbox-provider-certification-client:modify-for-odm-test-plan into plainbox-provider-certification-client:master

[Betty Lin]

Here is the test report:
https://certification.canonical.com/hardware/201711-25942/submission/146603/

[Sylvain Pineau (sylvain-pineau)]

+1, thanks for the 18.04 updates

review: Approve

diff --git a/units/client-cert-18-04.pxu b/units/client-cert-18-04.pxu
index fc9d989..06b4ac9 100644
--- a/units/client-cert-18-04.pxu
+++ b/units/client-cert-18-04.pxu
@@ -40,7 +40,7 @@ nested_part:
     # Test discrete card first, if present, since it's the one we will be using
     # after coming back from suspend if the system has hybrid graphics.
     after-suspend-graphics-discrete-gpu-cert-full
-    hibernate-discrete-gpu-cert-full
+    # hibernate-discrete-gpu-cert-full (No hibernate in 18.04)
     # Now we ask to switch to the integrated graphics card. This requires a
     # restart of checkbox.
     after-suspend-graphics-integrated-gpu-cert-full
@@ -53,11 +53,12 @@ nested_part:
     after-suspend-led-cert-full
     after-suspend-mediacard-cert-full
     after-suspend-touchpad-cert-full
+    after-suspend-touchscreen-cert-full
     after-suspend-usb-cert-full
     after-suspend-usb3-cert-full
     after-suspend-wireless-cert-full
     after-suspend-keys-cert-full
-    hibernate-integrated-gpu-cert-full
+    # hibernate-integrated-gpu-cert-full (No hibernate in 18.04)
     # The following tests should run BEFORE the automated tests. The reboot and
     # power off tests will also give us a clean system to start the stress run
     # with.
@@ -69,6 +70,11 @@ nested_part:
     misc-client-cert-full
     cpu-cert-full
     disk-cert-automated
-    stress-cert-full
+    #stress-cert-full
+    stress-suspend-30-cycles-with-reboots-automated
+    stress-ng-cert-automated
+    stress-30-reboot-poweroff-automated
     tpm2.0_3.0.4
     info-attachment-cert-full
+exclude:
+    com.canonical.certification::keys/hibernate