Merge ~sylvain-pineau/plainbox-provider-certification-client:core_stress_tests_for_all into plainbox-provider-certification-client:master

[Sylvain Pineau]

classic snaps are not allowing pm_test based jobs to resume checkbox sessions.
This is only supported using the deb packages.

But the switch to the core stress test version is also to be on par with core test plans where those jobs are much more user-friendly to run over remote.

As part of the update, I'm removing pm-graph (aka sleepgraph). lengthy test requiring ppa packages. Out of scope.

[Maciej Kisielewski (kissiel)]

Looks good. Bonus points for the cleanups.

review: Approve

[Jonathan Cave (jocave)]

LGTM

review: Approve

diff --git a/units/client-cert-odm-desktop-18-04.pxu b/units/client-cert-odm-desktop-18-04.pxu
index 3dffba7..36bd75d 100644
--- a/units/client-cert-odm-desktop-18-04.pxu
+++ b/units/client-cert-odm-desktop-18-04.pxu
@@ -37,12 +37,11 @@ nested_part:
     # after coming back from suspend if the system has hybrid graphics.
     after-suspend-graphics-discrete-gpu-cert-full
     after-suspend-monitor-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
     after-suspend-monitor-integrated-gpu-cert-full
-    suspend-key-led-oops-check-cert    
+    suspend-key-led-oops-check-cert
     after-suspend-audio-cert-full
     after-suspend-camera-cert-full
     after-suspend-input-cert-full
@@ -55,12 +54,7 @@ nested_part:
     after-suspend-usb-cert-full
     after-suspend-usb3-cert-full
     after-suspend-usb-c-cert-full
-    after-suspend-wireless-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.
-    power-management-reboot-poweroff-cert
+    after-suspend-wireless-cert-full
     # Automated Tests
     # The following tests are purely automated and/or lenghty stress tests.
     # They have been moved to the end of the test run to improve the testing
@@ -69,11 +63,10 @@ nested_part:
     cpu-cert-full
     disk-cert-automated
     stress-iperf3-automated
-    #stress-cert-full
-    stress-suspend-30-cycles-with-reboots-automated
+    warm-boot-stress-test
+    cold-boot-stress-test
+    suspend-stress-test
     stress-ng-cert-automated
-    stress-30-reboot-poweroff-automated
-    stress-pm-graph
     tpm2.0_3.0.4
     info-attachment-cert-full
 exclude:
diff --git a/units/client-cert-odm-desktop-20-04.pxu b/units/client-cert-odm-desktop-20-04.pxu
index 8aef968..1d4d9ce 100644
--- a/units/client-cert-odm-desktop-20-04.pxu
+++ b/units/client-cert-odm-desktop-20-04.pxu
@@ -42,10 +42,10 @@ nested_part:
     # restart of checkbox.
     after-suspend-graphics-integrated-gpu-cert-full
     after-suspend-monitor-integrated-gpu-cert-full
-    suspend-key-led-oops-check-cert    
+    suspend-key-led-oops-check-cert
     after-suspend-audio-cert-full
     after-suspend-camera-cert-full
-    after-suspend-input-cert-full    
+    after-suspend-input-cert-full
     after-suspend-keys-cert-full
     after-suspend-led-cert-full
     after-suspend-mediacard-cert-full
@@ -56,10 +56,6 @@ nested_part:
     after-suspend-usb3-cert-full
     after-suspend-usb-c-cert-full
     after-suspend-wireless-cert-full
-    # 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.
-    power-management-reboot-poweroff-cert
     # Automated Tests
     # The following tests are purely automated and/or lenghty stress tests.
     # They have been moved to the end of the test run to improve the testing
@@ -68,11 +64,10 @@ nested_part:
     cpu-cert-full
     disk-cert-automated
     stress-iperf3-automated
-    # stress-cert-full
-    stress-suspend-30-cycles-with-reboots-automated
+    warm-boot-stress-test
+    cold-boot-stress-test
+    suspend-stress-test
     stress-ng-cert-automated
-    stress-30-reboot-poweroff-automated
-    stress-pm-graph
     tpm2.0_4.1.1-automated
     info-attachment-cert-full
 exclude: