Merge ~sylvain-pineau/plainbox-provider-checkbox:blockers-auto-nested-parts into plainbox-provider-checkbox:master

[Sylvain Pineau]

This MR adds several new test plans meant to be used to create fully automated and certification blockers only test plans.

Provider validation passes (no clashes with other providers units).

[Sylvain Pineau (sylvain-pineau)]

I'm merging this one, main use will be oem provider updates.

review: Approve

diff --git a/units/audio/test-plan.pxu b/units/audio/test-plan.pxu
index a1c298e..b425c57 100644
--- a/units/audio/test-plan.pxu
+++ b/units/audio/test-plan.pxu
@@ -27,3 +27,40 @@ include:
     suspend/microphone-plug-detection-after-suspend        certification-status=blocker
     suspend/playback_headphones-after-suspend              certification-status=blocker
     suspend/alsa_record_playback_external-after-suspend    certification-status=blocker
+
+id: audio-cert-automated
+unit: test plan
+_name: Audio tests (automated)
+_description:
+ Audio tests (automated)
+include:
+    audio/alsa_info_collect
+    audio/alsa_info_attachment
+    audio/list_devices
+
+id: audio-cert-blockers
+unit: test plan
+_name: Audio tests (certification blockers only)
+_description:
+ Audio tests (certification blockers only)
+ See Monitor / Graphic test plans for hybrid-graphic monitor audio tests
+include:
+    audio/alsa_info_collect
+    audio/alsa_info_attachment
+    audio/list_devices
+    audio/speaker-headphone-plug-detection                 certification-status=blocker
+    audio/microphone-plug-detection                        certification-status=blocker
+    audio/playback_headphones                              certification-status=blocker
+    audio/alsa_record_playback_external                    certification-status=blocker
+    audio/playback_auto                                    certification-status=blocker
+    audio/alsa_record_playback_internal                    certification-status=blocker
+
+id: after-suspend-audio-cert-blockers
+unit: test plan
+_name: Audio tests (after suspend, certification blockers only)
+_description: Audio tests (after suspend, certification blockers only)
+include:
+    suspend/speaker-headphone-plug-detection-after-suspend certification-status=blocker
+    suspend/microphone-plug-detection-after-suspend        certification-status=blocker
+    suspend/playback_headphones-after-suspend              certification-status=blocker
+    suspend/alsa_record_playback_external-after-suspend    certification-status=blocker
diff --git a/units/bluetooth/test-plan.pxu b/units/bluetooth/test-plan.pxu
index ded7c5b..e6d64e9 100644
--- a/units/bluetooth/test-plan.pxu
+++ b/units/bluetooth/test-plan.pxu
@@ -10,3 +10,18 @@ include:
     bluetooth/HID
     bluetooth4/HOGP-mouse                          certification-status=blocker
     bluetooth4/HOGP-keyboard                       certification-status=blocker
+
+id: bluetooth-cert-automated
+unit: test plan
+_name: Bluetooth tests (automated)
+_description: Bluetooth tests (automated)
+include:
+    bluetooth/detect-output
+
+id: bluetooth-cert-blockers
+unit: test plan
+_name: Bluetooth tests (certification blockers only)
+_description: Bluetooth tests (certification blockers only)
+include:
+    bluetooth4/HOGP-mouse                          certification-status=blocker
+    bluetooth4/HOGP-keyboard                       certification-status=blocker
diff --git a/units/camera/test-plan.pxu b/units/camera/test-plan.pxu
index 998be60..2cf5550 100644
--- a/units/camera/test-plan.pxu
+++ b/units/camera/test-plan.pxu
@@ -15,3 +15,29 @@ _description: Camera tests (after suspend)
 include:
     camera/display_after_suspend                   certification-status=blocker
     camera/still_after_suspend                     certification-status=blocker
+
+id: camera-cert-automated
+unit: test plan
+_name: Camera tests (automated)
+_description: Camera tests (automated)
+include:
+    camera/detect                                  certification-status=blocker
+    camera/multiple-resolution-images              certification-status=blocker
+
+id: camera-cert-blockers
+unit: test plan
+_name: Camera tests (certification blockers only)
+_description: Camera tests (certification blockers only)
+include:
+    camera/detect                                  certification-status=blocker
+    camera/still                                   certification-status=blocker
+    camera/display                                 certification-status=blocker
+    camera/multiple-resolution-images              certification-status=blocker
+
+id: after-suspend-camera-cert-blockers
+unit: test plan
+_name: Camera tests (after suspend, certification blockers only)
+_description: Camera tests (after suspend, certification blockers only)
+include:
+    camera/display_after_suspend                   certification-status=blocker
+    camera/still_after_suspend                     certification-status=blocker
diff --git a/units/cpu/test-plan.pxu b/units/cpu/test-plan.pxu
index c6b6fd7..2678c31 100644
--- a/units/cpu/test-plan.pxu
+++ b/units/cpu/test-plan.pxu
@@ -3,12 +3,34 @@ unit: test plan
 _name: CPU tests
 _description: CPU tests
 include:
+nested_part:
+    cpu-cert-automated
+
+id: cpu-cert-automated
+unit: test plan
+_name: CPU tests (automated)
+_description: CPU tests (automated)
+include:
     cpu/cstates                                    certification-status=blocker
-    cpu/cstates_results.log                        
+    cpu/cstates_results.log
     cpu/scaling_test                               certification-status=blocker
-    cpu/scaling_test-log-attach                    
+    cpu/scaling_test-log-attach
     cpu/maxfreq_test                               certification-status=blocker
-    cpu/maxfreq_test-log-attach                    
+    cpu/maxfreq_test-log-attach
     cpu/offlining_test                             certification-status=blocker
     cpu/topology                                   certification-status=blocker
     cpu/clocktest
+
+id: cpu-cert-blockers
+unit: test plan
+_name: CPU tests (certification blockers only)
+_description: CPU tests (certification blockers only)
+include:
+    cpu/cstates                                    certification-status=blocker
+    cpu/cstates_results.log
+    cpu/scaling_test                               certification-status=blocker
+    cpu/scaling_test-log-attach
+    cpu/maxfreq_test                               certification-status=blocker
+    cpu/maxfreq_test-log-attach
+    cpu/offlining_test                             certification-status=blocker
+    cpu/topology                                   certification-status=blocker
diff --git a/units/disk/test-plan.pxu b/units/disk/test-plan.pxu
index cc7f176..08974cb 100644
--- a/units/disk/test-plan.pxu
+++ b/units/disk/test-plan.pxu
@@ -18,3 +18,12 @@ include:
     benchmarks/disk/hdparm-read_.*
     benchmarks/disk/hdparm-cache-read_.*
     disk/apste_support_on_.*
+
+id: disk-cert-blockers
+unit: test plan
+_name: Disk tests (certification blockers only)
+_description: Disk tests (certification blockers only)
+include:
+    disk/detect                                certification-status=blocker
+    disk/read_performance_.*                   certification-status=blocker
+    disk/storage_device_.*                     certification-status=blocker
diff --git a/units/esata/test-plan.pxu b/units/esata/test-plan.pxu
index ef30569..b7e59cd 100644
--- a/units/esata/test-plan.pxu
+++ b/units/esata/test-plan.pxu
@@ -6,3 +6,12 @@ include:
     esata/insert                                   certification-status=blocker
     esata/storage-test                             certification-status=blocker
     esata/remove                                   certification-status=blocker
+
+id: esata-cert-blockers
+unit: test plan
+_name: eSATA tests (certification blockers only)
+_description: eSATA tests (certification blockers only)
+include:
+    esata/insert                                   certification-status=blocker
+    esata/storage-test                             certification-status=blocker
+    esata/remove                                   certification-status=blocker
diff --git a/units/firewire/test-plan.pxu b/units/firewire/test-plan.pxu
index 5409e06..ecb6084 100644
--- a/units/firewire/test-plan.pxu
+++ b/units/firewire/test-plan.pxu
@@ -6,3 +6,12 @@ include:
     firewire/insert                                certification-status=blocker
     firewire/storage-test                          certification-status=blocker
     firewire/remove                                certification-status=blocker
+
+id: firewire-cert-blockers
+unit: test plan
+_name: Firewire tests (certification blockers only)
+_description: Firewire tests (certification blockers only)
+include:
+    firewire/insert                                certification-status=blocker
+    firewire/storage-test                          certification-status=blocker
+    firewire/remove                                certification-status=blocker
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index d292060..a85b194 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -76,3 +76,69 @@ include:
     suspend/2_video_after_suspend_.*_xenial                certification-status=blocker
     suspend/2_cycle_resolutions_after_suspend_.*_xenial    certification-status=non-blocker
     suspend/2_xrandr_screens_after_suspend_.*.tar.gz_xenial
+
+id: graphics-integrated-gpu-cert-blockers
+unit: test plan
+_name: Graphics tests (integrated GPU, certification blockers only)
+_description: Graphics tests (integrated GPU, certification blockers only)
+include:
+    graphics/xorg-version                      certification-status=blocker
+    graphics/xorg-failsafe                     certification-status=blocker
+    graphics/xorg-process                      certification-status=blocker
+    graphics/VESA_drivers_not_in_use           certification-status=blocker
+    graphics/1_maximum_resolution_.*           certification-status=blocker
+    graphics/1_glxgears_.*                     certification-status=blocker
+    graphics/1_driver_version_.*               certification-status=blocker
+    graphics/1_compiz_check_.*                 certification-status=blocker
+    graphics/1_rotation_.*                     certification-status=blocker
+    graphics/1_video_.*                        certification-status=blocker
+bootstrap_include:
+    graphics_card
+
+id: graphics-discrete-gpu-cert-blockers
+unit: test plan
+_name: Graphics tests (discrete GPU, certification blockers only)
+_description: Graphics tests (discrete GPU, certification blockers only)
+include:
+    graphics/2_switch_card_.*_xenial           certification-status=blocker
+    graphics/2_maximum_resolution_.*           certification-status=blocker
+    graphics/2_valid_opengl_renderer_.*        certification-status=blocker
+    graphics/2_glxgears_.*                     certification-status=blocker
+    graphics/2_driver_version_.*               certification-status=blocker
+    graphics/2_compiz_check_.*                 certification-status=blocker
+    graphics/2_rotation_.*                     certification-status=blocker
+    graphics/2_video_.*                        certification-status=blocker
+bootstrap_include:
+    graphics_card
+
+id: after-suspend-graphics-integrated-gpu-cert-blockers
+unit: test plan
+_name: After suspend tests (integrated GPU, certification blockers only)
+_description: After suspend tests (integrated GPU, certification blockers only)
+include:
+    graphics/1_switch_card_.*_xenial                       certification-status=blocker
+    suspend/1_resolution_before_suspend_.*_xenial          certification-status=blocker
+    suspend/suspend_advanced                               certification-status=blocker
+    power-management/lid                                   certification-status=blocker
+    power-management/lid_close                             certification-status=blocker
+    power-management/lid_open                              certification-status=blocker
+    suspend/1_compiz_check_after_suspend_.*_xenial         certification-status=blocker
+    suspend/1_driver_version_after_suspend_.*_xenial       certification-status=blocker
+    suspend/1_resolution_after_suspend_.*_xenial           certification-status=blocker
+    suspend/1_display_after_suspend_.*_xenial              certification-status=blocker
+    suspend/1_glxgears_after_suspend_.*_xenial             certification-status=blocker
+    suspend/1_video_after_suspend_.*_xenial                certification-status=blocker
+
+id: after-suspend-graphics-discrete-gpu-cert-blockers
+unit: test plan
+_name: After suspend tests (discrete GPU, certification blockers only)
+_description: After suspend tests (discrete GPU, certification blockers only)
+include:
+    suspend/2_resolution_before_suspend_.*_xenial          certification-status=blocker
+    suspend/2_suspend_after_switch_to_card_.*_xenial       certification-status=blocker
+    suspend/2_compiz_check_after_suspend_.*_xenial         certification-status=blocker
+    suspend/2_driver_version_after_suspend_.*_xenial       certification-status=blocker
+    suspend/2_resolution_after_suspend_.*_xenial           certification-status=blocker
+    suspend/2_display_after_suspend_.*_xenial              certification-status=blocker
+    suspend/2_glxgears_after_suspend_.*_xenial             certification-status=blocker
+    suspend/2_video_after_suspend_.*_xenial                certification-status=blocker
diff --git a/units/hibernate/test-plan.pxu b/units/hibernate/test-plan.pxu
index 3c0f12a..8514f12 100644
--- a/units/hibernate/test-plan.pxu
+++ b/units/hibernate/test-plan.pxu
@@ -5,7 +5,7 @@ _description: Hibernate tests (integrated GPU)
 include:
     power-management/1_hibernate_advanced_.*               certification-status=non-blocker
     power-management/1_hibernate-single-log-attach_.*
-    keys/hibernate                                         certification-status=blocker
+    keys/hibernate                                         certification-status=non-blocker
 
 id: hibernate-discrete-gpu-cert-full
 unit: test plan
diff --git a/units/input/test-plan.pxu b/units/input/test-plan.pxu
index a0877c5..8033883 100644
--- a/units/input/test-plan.pxu
+++ b/units/input/test-plan.pxu
@@ -15,3 +15,20 @@ _description: Input tests (after suspend)
 include:
     suspend/pointing-after-suspend_.*          certification-status=blocker
     suspend/clicking-after-suspend_.*          certification-status=blocker
+
+id: input-cert-blockers
+unit: test plan
+_name: Input tests (certification blockers only)
+_description: Input tests (certification blockers only)
+include:
+    input/pointing_.*                          certification-status=blocker
+    input/clicking_.*                          certification-status=blocker
+    input/keyboard                             certification-status=blocker
+
+id: after-suspend-input-cert-blockers
+unit: test plan
+_name: Input tests (after suspend, certification blockers only)
+_description: Input tests (after suspend, certification blockers only)
+include:
+    suspend/pointing-after-suspend_.*          certification-status=blocker
+    suspend/clicking-after-suspend_.*          certification-status=blocker
diff --git a/units/keys/test-plan.pxu b/units/keys/test-plan.pxu
index b2e3f91..ebd1696 100644
--- a/units/keys/test-plan.pxu
+++ b/units/keys/test-plan.pxu
@@ -13,3 +13,20 @@ include:
     keys/volume                                    certification-status=blocker
     keys/video-out                                 certification-status=blocker
     keys/wireless                                  certification-status=blocker
+
+id: keys-cert-blockers
+unit: test plan
+_name: Special keys tests (certification blockers only)
+_description:
+ Special keys tests (w/o sleep/hibernate keys, see Power Management test plans)
+ (certification blockers only)
+include:
+    keys/lock-screen                               certification-status=blocker
+    keys/super                                     certification-status=blocker
+    keys/battery-info                              certification-status=blocker
+    keys/brightness                                certification-status=blocker
+    keys/media-control                             certification-status=blocker
+    keys/mute                                      certification-status=blocker
+    keys/volume                                    certification-status=blocker
+    keys/video-out                                 certification-status=blocker
+    keys/wireless                                  certification-status=blocker
diff --git a/units/mediacard/test-plan.pxu b/units/mediacard/test-plan.pxu
index eafadd8..087e556 100644
--- a/units/mediacard/test-plan.pxu
+++ b/units/mediacard/test-plan.pxu
@@ -21,3 +21,27 @@ include:
     suspend/sdhc-insert-after-suspend              certification-status=blocker
     suspend/sdhc-storage-after-suspend             certification-status=blocker
     suspend/sdhc-remove-after-suspend              certification-status=blocker
+
+id: mediacard-cert-blockers
+unit: test plan
+_name: Mediacard tests (certification blockers only)
+_description: Mediacard tests (certification blockers only)
+include:
+    mediacard/sd-insert                            certification-status=blocker
+    mediacard/sd-storage                           certification-status=blocker
+    mediacard/sd-remove                            certification-status=blocker
+    mediacard/sdhc-insert                          certification-status=blocker
+    mediacard/sdhc-storage                         certification-status=blocker
+    mediacard/sdhc-remove                          certification-status=blocker
+
+id: after-suspend-mediacard-cert-blockers
+unit: test plan
+_name: Mediacard tests (after suspend, certification blockers only)
+_description: Mediacard tests (after suspend, certification blockers only)
+include:
+    suspend/sd-insert-after-suspend                certification-status=blocker
+    suspend/sd-storage-after-suspend               certification-status=blocker
+    suspend/sd-remove-after-suspend                certification-status=blocker
+    suspend/sdhc-insert-after-suspend              certification-status=blocker
+    suspend/sdhc-storage-after-suspend             certification-status=blocker
+    suspend/sdhc-remove-after-suspend              certification-status=blocker
diff --git a/units/miscellanea/test-plan.pxu b/units/miscellanea/test-plan.pxu
index eb97d4f..86f502c 100644
--- a/units/miscellanea/test-plan.pxu
+++ b/units/miscellanea/test-plan.pxu
@@ -3,6 +3,16 @@ unit: test plan
 _name: Miscellaneous client tests
 _description: Miscellaneous client tests (fwts, dmi, oops)
 include:
+nested_part:
+    misc-client-cert-automated
+
+id: misc-client-cert-automated
+unit: test plan
+_name: Miscellaneous client tests (automated)
+_description:
+ Miscellaneous client tests (fwts, dmi, oops)
+ (automated)
+include:
     install/apt-get-gets-updates
     memory/info                                    certification-status=blocker
     firmware/fwts_desktop_diagnosis
@@ -17,3 +27,18 @@ include:
     miscellanea/dmitest_client
 bootstrap_include:
     fwts
+
+id: misc-client-cert-blockers
+unit: test plan
+_name: Miscellaneous client tests (certification blockers only)
+_description:
+ Miscellaneous client tests (fwts, dmi, oops)
+ (certification blockers only)
+include:
+    memory/info                                    certification-status=blocker
+    firmware/fwts_wakealarm.*                      certification-status=blocker
+    firmware/fwts_uefirtvariable.*                 certification-status=blocker
+    miscellanea/oops                               certification-status=blocker
+    miscellanea/oops_results.log
+bootstrap_include:
+    fwts
diff --git a/units/mobilebroadband/test-plan.pxu b/units/mobilebroadband/test-plan.pxu
index b9901a6..166a297 100644
--- a/units/mobilebroadband/test-plan.pxu
+++ b/units/mobilebroadband/test-plan.pxu
@@ -3,5 +3,13 @@ unit: test plan
 _name: Mobile broadband tests
 _description: Mobile broadband tests
 include:
+nested_part:
+    mobilebroadband-cert-automated
+
+id: mobilebroadband-cert-automated
+unit: test plan
+_name: Mobile broadband tests (automated)
+_description: Mobile broadband tests (automated)
+include:
     mobilebroadband/gsm_connection             certification-status=non-blocker
     mobilebroadband/cdma_connection            certification-status=non-blocker
diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu
index d3527da..10976c9 100644
--- a/units/monitor/test-plan.pxu
+++ b/units/monitor/test-plan.pxu
@@ -45,3 +45,42 @@ include:
     monitor/2_multi-head_.*                    certification-status=blocker
 bootstrap_include:
     graphics_card
+
+id: monitor-integrated-gpu-cert-blockers
+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
+    audio/1_playback_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: monitor-discrete-gpu-cert-blockers
+unit: test plan
+_name: Monitor tests (discrete GPU, certification blockers only)
+_description: Monitor tests (discrete GPU, certification blockers only)
+include:
+    monitor/2_powersaving_.*                   certification-status=blocker
+    monitor/2_dim_brightness_.*                certification-status=blocker
+    monitor/2_displayport_.*                   certification-status=blocker
+    audio/2_playback_displayport_.*            certification-status=blocker
+    monitor/2_dvi_.*                           certification-status=blocker
+    monitor/2_hdmi_.*                          certification-status=blocker
+    audio/2_playback_hdmi_.*                   certification-status=blocker
+    monitor/2_thunderbolt_.*                   certification-status=blocker
+    audio/2_playback_thunderbolt_.*            certification-status=blocker
+    monitor/2_vga_.*                           certification-status=blocker
+    monitor/2_multi-head_.*                    certification-status=blocker
+bootstrap_include:
+    graphics_card
diff --git a/units/networking/test-plan.pxu b/units/networking/test-plan.pxu
index ebaee65..ade662a 100644
--- a/units/networking/test-plan.pxu
+++ b/units/networking/test-plan.pxu
@@ -3,6 +3,31 @@ unit: test plan
 _name: Networking tests
 _description: Networking tests
 include:
+nested_part:
+    networking-cert-automated
+    networking-cert-manual
+
+id: networking-cert-manual
+unit: test plan
+_name: Networking tests (manual)
+_description: Networking tests (manual)
+include:
+    networking/info.*                              certification-status=blocker
+
+id: networking-cert-automated
+unit: test plan
+_name: Networking tests (automated)
+_description: Networking tests (automated)
+include:
+    ethernet/detect                                certification-status=blocker
+    networking/gateway_ping                        certification-status=blocker
+    networking/ntp                                 certification-status=blocker
+
+id: networking-cert-blockers
+unit: test plan
+_name: Networking tests (certification blockers only)
+_description: Networking tests (certification blockers only)
+include:
     ethernet/detect                                certification-status=blocker
     networking/gateway_ping                        certification-status=blocker
     networking/info.*                              certification-status=blocker
diff --git a/units/optical/test-plan.pxu b/units/optical/test-plan.pxu
index 7336d45..ba63c28 100644
--- a/units/optical/test-plan.pxu
+++ b/units/optical/test-plan.pxu
@@ -11,3 +11,17 @@ include:
     optical/bluray-write_.*                        certification-status=blocker
 bootstrap_include:
     device
+
+id: optical-cert-blockers
+unit: test plan
+_name: Optical drive tests (certification blockers only)
+_description: Optical drive tests (certification blockers only)
+include:
+    optical/detect                                 certification-status=blocker
+    optical/read_.*                                certification-status=blocker
+    optical/cdrom-write_.*                         certification-status=blocker
+    optical/dvd-write_.*                           certification-status=blocker
+    optical/bluray-read_.*                         certification-status=blocker
+    optical/bluray-write_.*                        certification-status=blocker
+bootstrap_include:
+    device
diff --git a/units/power-management/test-plan.pxu b/units/power-management/test-plan.pxu
index 6a4da12..2cd1a76 100644
--- a/units/power-management/test-plan.pxu
+++ b/units/power-management/test-plan.pxu
@@ -3,15 +3,55 @@ unit: test plan
 _name: Power Management precheck tests
 _description: Power Management precheck tests
 include:
+nested_part:
+    power-management-precheck-cert-automated
+
+id: power-management-reboot-poweroff-cert
+unit: test plan
+_name: Power Management reboot and power off tests
+_description: Power Management reboot and power off tests
+include:
+nested_part:
+    power-management-reboot-poweroff-cert-automated
+
+id: power-management-precheck-cert-automated
+unit: test plan
+_name: Power Management precheck tests (automated)
+_description: Power Management precheck tests (automated)
+include:
     power-management/rtc                           certification-status=blocker
     power-management/tickless_idle                 certification-status=blocker
     power-management/fwts_wakealarm                certification-status=blocker
     power-management/fwts_wakealarm-log-attach
 
-id: power-management-reboot-poweroff-cert
+id: power-management-reboot-poweroff-cert-automated
 unit: test plan
-_name: Power Management reboot and power off tests
-_description: Power Management reboot and power off tests
+_name: Power Management reboot and power off tests (automated)
+_description: Power Management reboot and power off tests (automated)
+include:
+    power-management/poweroff                      certification-status=blocker
+    power-management/poweroff-log-attach
+    power-management/reboot                        certification-status=blocker
+    power-management/reboot-log-attach
+
+id: power-management-precheck-cert-blockers
+unit: test plan
+_name:
+ Power Management precheck tests (certification blockers only)
+_description:
+ Power Management precheck tests (certification blockers only)
+include:
+    power-management/rtc                           certification-status=blocker
+    power-management/tickless_idle                 certification-status=blocker
+    power-management/fwts_wakealarm                certification-status=blocker
+    power-management/fwts_wakealarm-log-attach
+
+id: power-management-reboot-poweroff-cert-blockers
+unit: test plan
+_name:
+ Power Management reboot and power off tests (certification blockers only)
+_description:
+ Power Management reboot and power off tests (certification blockers only)
 include:
     power-management/poweroff                      certification-status=blocker
     power-management/poweroff-log-attach
diff --git a/units/stress/test-plan.pxu b/units/stress/test-plan.pxu
index 6fa0bc3..5f72916 100644
--- a/units/stress/test-plan.pxu
+++ b/units/stress/test-plan.pxu
@@ -3,9 +3,53 @@ unit: test plan
 _name: Stress tests
 _description: Stress tests
 include:
-    power-management/suspend_30_cycles               certification-status=blocker
+nested_part:
+    stress-cert-automated
+
+id: stress-cert-automated
+unit: test plan
+_name: Stress tests (automated)
+_description: Stress tests (automated)
+include:
+    power-management/suspend_30_cycles             certification-status=blocker
+    power-management/suspend-30-cycle-log-attach
+    power-management/suspend-30-cycles-time-check  certification-status=non-blocker
+    stress/cpu_stress_ng_test                      certification-status=blocker
+
+id: stress-cert-blockers
+unit: test plan
+_name: Stress tests (certification blockers only)
+_description: Stress tests (certification blockers only)
+include:
+    power-management/suspend_30_cycles             certification-status=blocker
     power-management/suspend-30-cycle-log-attach
-    power-management/suspend-30-cycles-time-check    certification-status=non-blocker
-    power-management/hibernate_30_cycles             certification-status=non-blocker
-    power-management/hibernate-30-cycle-log-attach
-    stress/cpu_stress_test                           certification-status=blocker
+    stress/cpu_stress_ng_test                      certification-status=blocker
+
+id: stress-suspend-30-cycles-with-reboots-automated
+unit: test plan
+_name: Suspend stress tests (with reboots)
+_description: Suspend stress tests (with reboots)
+include:
+    power-management/suspend_30_cycles_with_reboots
+    power-management/suspend-30-cycles-log-check-with-reboots
+    power-management/suspend-30-cycle-log-attach-with-reboots
+    power-management/suspend-30-cycles-time-check-with-reboots
+
+id: stress-30-reboot-poweroff-automated
+unit: test plan
+_name: Power Management reboot and power off stress tests (automated)
+_description: Power Management reboot and power off stress tests (automated)
+include:
+    stress/reboot_30
+    stress/reboot_30_log
+    stress/poweroff_30
+    stress/poweroff_30_log
+
+id: stress-ng-cert-automated
+unit: test plan
+_name: Stress NG tests (automated)
+_description: Stress NG tests (automated)
+include:
+    stress/cpu_stress_ng_test                      certification-status=blocker
+    memory/memory_stress_ng                        certification-status=blocker
+
diff --git a/units/suspend/test-plan.pxu b/units/suspend/test-plan.pxu
index bcbe39c..57124f5 100644
--- a/units/suspend/test-plan.pxu
+++ b/units/suspend/test-plan.pxu
@@ -3,6 +3,33 @@ unit: test plan
 _name: Before suspend reference tests
 _description: Before suspend reference tests
 include:
+nested_part:
+    before-suspend-reference-cert-automated
+
+id: after-suspend-reference-cert-full
+unit: test plan
+_name: After suspend reference tests
+_description: After suspend reference tests
+include:
+nested_part:
+    after-suspend-reference-cert-automated
+
+id: suspend-key-led-oops-check-cert
+unit: test plan
+_name: After suspend LED and oops tests (using special sleep key)
+_description: After suspend LED and oops tests (using special sleep key)
+include:
+    keys/sleep                                     certification-status=blocker
+    suspend/oops_after_suspend                     certification-status=blocker
+    suspend/oops_results_after_suspend.log
+    led/power-blink-suspend
+    led/suspend
+
+id: before-suspend-reference-cert-automated
+unit: test plan
+_name: Before suspend reference tests (automated)
+_description: Before suspend reference tests (automated)
+include:
     suspend/network_before_suspend                 certification-status=blocker
     suspend/audio_before_suspend                   certification-status=blocker
     suspend/cpu_before_suspend                     certification-status=blocker
@@ -11,10 +38,10 @@ include:
     suspend/bluetooth_obex_browse_before_suspend
     suspend/bluetooth_obex_get_before_suspend
 
-id: after-suspend-reference-cert-full
+id: after-suspend-reference-cert-automated
 unit: test plan
-_name: After suspend reference tests
-_description: After suspend reference tests
+_name: After suspend reference tests (automated)
+_description: After suspend reference tests (automated)
 include:
     suspend/network_after_suspend                  certification-status=blocker
     suspend/audio_after_suspend                    certification-status=blocker
@@ -25,13 +52,35 @@ include:
     suspend/bluetooth_obex_browse_after_suspend
     suspend/bluetooth_obex_get_after_suspend
 
-id: suspend-key-led-oops-check-cert
+id: before-suspend-reference-cert-blockers
 unit: test plan
-_name: After suspend LED and oops tests (using special sleep key)
-_description: After suspend LED and oops tests (using special sleep key)
+_name: Before suspend reference tests (certification blockers only)
+_description: Before suspend reference tests (certification blockers only)
+include:
+    suspend/network_before_suspend                 certification-status=blocker
+    suspend/audio_before_suspend                   certification-status=blocker
+    suspend/cpu_before_suspend                     certification-status=blocker
+    suspend/memory_before_suspend                  certification-status=blocker
+
+id: after-suspend-reference-cert-blockers
+unit: test plan
+_name: After suspend reference tests (certification blockers only)
+_description: After suspend reference tests (certification blockers only)
+include:
+    suspend/network_after_suspend                  certification-status=blocker
+    suspend/audio_after_suspend                    certification-status=blocker
+    suspend/cpu_after_suspend                      certification-status=blocker
+    suspend/memory_after_suspend                   certification-status=blocker
+    suspend/bluetooth_detect_after_suspend         certification-status=blocker
+
+id: suspend-key-led-oops-check-cert-blockers
+unit: test plan
+_name:
+ After suspend LED and oops tests (using special sleep key, cert. blockers only)
+_description:
+ After suspend LED and oops tests (using special sleep key)
+ (certification blockers only)
 include:
     keys/sleep                                     certification-status=blocker
     suspend/oops_after_suspend                     certification-status=blocker
     suspend/oops_results_after_suspend.log
-    led/power-blink-suspend
-    led/suspend
diff --git a/units/thunderbolt/test-plan.pxu b/units/thunderbolt/test-plan.pxu
index 686bb82..054bb26 100644
--- a/units/thunderbolt/test-plan.pxu
+++ b/units/thunderbolt/test-plan.pxu
@@ -9,3 +9,12 @@ include:
     thunderbolt3/insert                        certification-status=non-blocker
     thunderbolt3/storage-test                  certification-status=non-blocker
     thunderbolt3/remove                        certification-status=non-blocker
+
+id: thunderbolt-cert-blockers
+unit: test plan
+_name: Thunderbolt tests (certification blockers only)
+_description: Thunderbolt tests (certification blockers only)
+include:
+    thunderbolt/insert                         certification-status=blocker
+    thunderbolt/storage-test                   certification-status=blocker
+    thunderbolt/remove                         certification-status=blocker
diff --git a/units/touchpad/test-plan.pxu b/units/touchpad/test-plan.pxu
index b270d92..7514991 100644
--- a/units/touchpad/test-plan.pxu
+++ b/units/touchpad/test-plan.pxu
@@ -39,3 +39,41 @@ include:
     touchpad/multitouch-horizontal-after-suspend   certification-status=blocker
     touchpad/multitouch-vertical-after-suspend     certification-status=blocker
     touchpad/multitouch-dash-after-suspend         certification-status=non-blocker
+
+id: touchpad-cert-blockers
+unit: test plan
+_name: Touchpad tests (certification blockers only)
+_description: Touchpad tests (certification blockers only)
+include:
+    touchpad/basic                                 certification-status=blocker
+    touchpad/detected-as-mouse                     certification-status=blocker
+    touchpad/continuous-move                       certification-status=blocker
+    touchpad/horizontal                            certification-status=blocker
+    touchpad/vertical                              certification-status=blocker
+    touchpad/singletouch-automated                 certification-status=blocker
+    touchpad/singletouch-selection                 certification-status=blocker
+    touchpad/drag-and-drop                         certification-status=blocker
+    touchpad/multitouch-automated                  certification-status=blocker
+    touchpad/multitouch-manual                     certification-status=blocker
+    touchpad/multitouch-rightclick                 certification-status=blocker
+    touchpad/multitouch-horizontal                 certification-status=blocker
+    touchpad/multitouch-vertical                   certification-status=blocker
+
+id: after-suspend-touchpad-cert-blockers
+unit: test plan
+_name: Touchpad tests (after suspend, certification blockers only)
+_description: Touchpad tests (after suspend, certification blockers only)
+include:
+    touchpad/basic-after-suspend                   certification-status=blocker
+    touchpad/detected-as-mouse-after-suspend       certification-status=blocker
+    touchpad/continuous-move-after-suspend         certification-status=blocker
+    touchpad/horizontal-after-suspend              certification-status=blocker
+    touchpad/vertical-after-suspend                certification-status=blocker
+    touchpad/singletouch-automated-after-suspend   certification-status=blocker
+    touchpad/singletouch-selection-after-suspend   certification-status=blocker
+    touchpad/drag-and-drop-after-suspend           certification-status=blocker
+    touchpad/multitouch-automated-after-suspend    certification-status=blocker
+    touchpad/multitouch-manual-after-suspend       certification-status=blocker
+    touchpad/multitouch-rightclick-after-suspend   certification-status=blocker
+    touchpad/multitouch-horizontal-after-suspend   certification-status=blocker
+    touchpad/multitouch-vertical-after-suspend     certification-status=blocker
diff --git a/units/touchscreen/test-plan.pxu b/units/touchscreen/test-plan.pxu
index eaba085..e984af9 100644
--- a/units/touchscreen/test-plan.pxu
+++ b/units/touchscreen/test-plan.pxu
@@ -9,3 +9,13 @@ include:
     touchscreen/3-touch-tap                    certification-status=blocker
     touchscreen/4-touch-tap                    certification-status=blocker
     touchscreen/multitouch-dash                certification-status=non-blocker
+
+id: touchscreen-cert-blockers
+unit: test plan
+_name: Touchscreen tests (certification blockers only)
+_description: Touchscreen tests (certification blockers only)
+include:
+    touchscreen/drag-n-drop                    certification-status=blocker
+    touchscreen/multitouch-zoom                certification-status=blocker
+    touchscreen/3-touch-tap                    certification-status=blocker
+    touchscreen/4-touch-tap                    certification-status=blocker
diff --git a/units/usb/test-plan.pxu b/units/usb/test-plan.pxu
index 5588110..96ece6d 100644
--- a/units/usb/test-plan.pxu
+++ b/units/usb/test-plan.pxu
@@ -49,3 +49,41 @@ include:
     suspend/usb3_insert_after_suspend                      certification-status=blocker
     suspend/usb3_storage_automated_after_suspend           certification-status=blocker
     suspend/usb3_remove_after_suspend                      certification-status=blocker
+
+id: usb-cert-blockers
+unit: test plan
+_name: USB tests (certification blockers only)
+_description: USB tests (certification blockers only)
+include:
+    usb/detect                                 certification-status=blocker
+    usb/HID                                    certification-status=blocker
+    usb/insert                                 certification-status=blocker
+    usb/storage-automated                      certification-status=blocker
+    usb/remove                                 certification-status=blocker
+
+id: usb3-cert-blockers
+unit: test plan
+_name: USB3 tests (certification blockers only)
+_description: USB3 tests (certification blockers only)
+include:
+    usb3/insert                                certification-status=blocker
+    usb3/storage-automated                     certification-status=blocker
+    usb3/remove                                certification-status=blocker
+
+id: after-suspend-usb-cert-blockers
+unit: test plan
+_name: USB tests (after suspend, certification blockers only)
+_description: USB tests (after suspend, certification blockers only)
+include:
+    suspend/usb_insert_after_suspend                       certification-status=blocker
+    suspend/usb_storage_automated_after_suspend            certification-status=blocker
+    suspend/usb_remove_after_suspend                       certification-status=blocker
+
+id: after-suspend-usb3-cert-blockers
+unit: test plan
+_name: USB3 tests (after suspend, certification blockers only)
+_description: USB3 tests (after suspend, certification blockers only)
+include:
+    suspend/usb3_insert_after_suspend                      certification-status=blocker
+    suspend/usb3_storage_automated_after_suspend           certification-status=blocker
+    suspend/usb3_remove_after_suspend                      certification-status=blocker
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index b2c73ff..b4cf2f7 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -3,6 +3,22 @@ unit: test plan
 _name: Wireless tests
 _description: Wireless connection tests
 include:
+nested_part:
+    wireless-cert-automated
+
+id: after-suspend-wireless-cert-full
+unit: test plan
+_name: Wireless tests (after suspend)
+_description: Wireless connection tests (after suspend)
+include:
+nested_part:
+    after-suspend-wireless-cert-automated
+
+id: wireless-cert-automated
+unit: test plan
+_name: Wireless tests
+_description: Wireless connection tests
+include:
     wireless/wireless_scanning                     certification-status=blocker
     wireless/wireless_connection_wpa_bg            certification-status=blocker
     wireless/wireless_connection_open_bg           certification-status=blocker
@@ -11,10 +27,36 @@ include:
     wireless/wireless_connection_wpa_ac            certification-status=blocker
     wireless/wireless_connection_open_ac           certification-status=blocker
 
-id: after-suspend-wireless-cert-full
+id: after-suspend-wireless-cert-automated
 unit: test plan
-_name: Wireless tests (after suspend)
-_description: Wireless connection tests (after suspend)
+_name: Wireless tests (after suspend, automated)
+_description: Wireless connection tests (after suspend, automated)
+include:
+    suspend/wireless_connection_after_suspend_wpa_bg       certification-status=blocker
+    suspend/wireless_connection_after_suspend_open_bg      certification-status=blocker
+    suspend/wireless_connection_after_suspend_wpa_n        certification-status=blocker
+    suspend/wireless_connection_after_suspend_open_n       certification-status=blocker
+    suspend/wireless_connection_after_suspend_wpa_ac       certification-status=blocker
+    suspend/wireless_connection_after_suspend_open_ac      certification-status=blocker
+
+id: wireless-cert-blockers
+unit: test plan
+_name: Wireless tests (certification blockers only)
+_description: Wireless connection tests (certification blockers only)
+include:
+    wireless/wireless_scanning                     certification-status=blocker
+    wireless/wireless_connection_wpa_bg            certification-status=blocker
+    wireless/wireless_connection_open_bg           certification-status=blocker
+    wireless/wireless_connection_wpa_n             certification-status=blocker
+    wireless/wireless_connection_open_n            certification-status=blocker
+    wireless/wireless_connection_wpa_ac            certification-status=blocker
+    wireless/wireless_connection_open_ac           certification-status=blocker
+
+id: after-suspend-wireless-cert-blockers
+unit: test plan
+_name: Wireless tests (after suspend, certification blockers only)
+_description:
+ Wireless connection tests (after suspend, certification blockers only)
 include:
     suspend/wireless_connection_after_suspend_wpa_bg       certification-status=blocker
     suspend/wireless_connection_after_suspend_open_bg      certification-status=blocker