monitor: Split before and after suspend jobs in distinct test plans

Only including (after-suspend-manual-) qualifiers adds a dependency on suspend/suspend_advanced we can't control as the ordering is then suspend monitor test monitor test after suspend With dedicated nested test plans, the ordering is preserved by calling the "after-suspend" test plan after the part that already runs S3. 

1 files changed, 62 insertions, 2 deletions

diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu
index ca90299..fbed317 100644
--- a/units/monitor/test-plan.pxu
+++ b/units/monitor/test-plan.pxu
@@ -10,14 +10,50 @@ nested_part:
 com.canonical.certification::monitor-integrated-gpu-cert-manual
 com.canonical.certification::monitor-integrated-gpu-cert-automated
 
+id: after-suspend-monitor-integrated-gpu-cert-full
+unit: test plan
+_name: Monitor tests (after suspend, integrated GPU)
+_description: Monitor tests (after suspend, integrated GPU)
+include:
+nested_part:
+ after-suspend-manual-monitor-integrated-gpu-cert-manual
+
 id: monitor-integrated-gpu-cert-manual
 unit: test plan
 _name: Monitor tests (integrated GPU) (Manual)
 _description:
 Monitor tests (integrated GPU) (Manual)
 include:
+ monitor/1_powersaving_.* certification-status=blocker
+ monitor/1_dim_brightness_.* certification-status=blocker
+ monitor/1_displayport_.* certification-status=blocker
+ monitor/1_type-c_displayport_.* certification-status=blocker
+ monitor/type-c-to-hdmi certification-status=blocker
+ monitor/type-c-to-vga certification-status=blocker
+ audio/1_playback_displayport_.* certification-status=blocker
+ audio/1_playback_type-c_displayport_.* certification-status=blocker
+ monitor/1_dvi_.* certification-status=blocker
+ monitor/1_hdmi_.* certification-status=blocker
+ audio/1_playback_hdmi_.* certification-status=blocker
+ monitor/1_thunderbolt_.* certification-status=blocker
+ monitor/1_thunderbolt3_.* certification-status=non-blocker
+ audio/1_playback_thunderbolt_.* certification-status=blocker
+ audio/1_playback_thunderbolt3_.* certification-status=non-blocker
+ thunderbolt/daisy-chain certification-status=blocker
+ thunderbolt3/daisy-chain certification-status=non-blocker
+ monitor/1_vga_.* certification-status=blocker
+ monitor/1_multi-head_.* certification-status=blocker
+bootstrap_include:
+ graphics_card
+
+id: after-suspend-manual-monitor-integrated-gpu-cert-manual
+unit: test plan
+_name: Monitor tests (after manual suspend, integrated GPU) (Manual)
+_description:
+ Monitor tests (after manual suspend, integrated GPU) (Manual)
+include:
 (after-suspend-manual-)?monitor/1_powersaving_.* certification-status=blocker
- monitor/1_dim_brightness_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_dim_brightness_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_displayport_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_type-c_displayport_.* certification-status=blocker
 (after-suspend-manual-)?monitor/type-c-to-hdmi certification-status=blocker
@@ -99,8 +135,32 @@ unit: test plan
 _name: Monitor tests (integrated GPU, certification blockers only)
 _description: Monitor tests (integrated GPU, certification blockers only)
 include:
+ monitor/1_powersaving_.* certification-status=blocker
+ monitor/1_dim_brightness_.* certification-status=blocker
+ monitor/1_displayport_.* certification-status=blocker
+ monitor/1_type-c_displayport_.* certification-status=blocker
+ monitor/type-c-to-hdmi certification-status=blocker
+ monitor/type-c-to-vga certification-status=blocker
+ audio/1_playback_displayport_.* certification-status=blocker
+ audio/1_playback_type-c_displayport_.* certification-status=blocker
+ monitor/1_dvi_.* certification-status=blocker
+ monitor/1_hdmi_.* certification-status=blocker
+ audio/1_playback_hdmi_.* certification-status=blocker
+ monitor/1_thunderbolt_.* certification-status=blocker
+ audio/1_playback_thunderbolt_.* certification-status=blocker
+ thunderbolt/daisy-chain certification-status=blocker
+ monitor/1_vga_.* certification-status=blocker
+ monitor/1_multi-head_.* certification-status=blocker
+bootstrap_include:
+ graphics_card
+
+id: after-suspend-manual-monitor-integrated-gpu-cert-blockers
+unit: test plan
+_name: Monitor tests (after manual suspend, integrated GPU, certification blockers only)
+_description: Monitor tests (after manual suspend, integrated GPU, certification blockers only)
+include:
 (after-suspend-manual-)?monitor/1_powersaving_.* certification-status=blocker
- monitor/1_dim_brightness_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/1_dim_brightness_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_displayport_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_type-c_displayport_.* certification-status=blocker
 (after-suspend-manual-)?monitor/type-c-to-hdmi certification-status=blocker