Merge #337157 from ~kissiel/plainbox-provider-checkbox:split-full-tps-into-three

23 files changed, 643 insertions, 198 deletions

diff --git a/units/audio/test-plan.pxu b/units/audio/test-plan.pxu
index b425c57..a147682 100644
--- a/units/audio/test-plan.pxu
+++ b/units/audio/test-plan.pxu
@@ -5,18 +5,27 @@ _description:
 Audio tests
 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
- audio/channels
- audio/external-linein
- audio/external-lineout
+nested_part:
+ com.canonical.certification::audio-cert-manual
+ com.canonical.certification::audio-cert-automated
+
+id: audio-cert-manual
+unit: test plan
+_name: Audio tests (Manual)
+_description:
+ Audio tests
+ See Monitor / Graphic test plans for hybrid-graphic monitor audio tests (Manual)
+include:
+ 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
+ audio/channels
+ audio/external-linein
+ audio/external-lineout
+
 
 id: after-suspend-audio-cert-full
 unit: test plan
diff --git a/units/bluetooth/test-plan.pxu b/units/bluetooth/test-plan.pxu
index 7fa002e..ae2c305 100644
--- a/units/bluetooth/test-plan.pxu
+++ b/units/bluetooth/test-plan.pxu
@@ -1,13 +1,24 @@
 id: bluetooth-cert-full
 unit: test plan
 _name: Bluetooth tests
-_description: Bluetooth tests
+_description:
+ Bluetooth tests
 include:
- bluetooth/detect-output certification-status=blocker
- bluetooth/audio-a2dp certification-status=blocker
- bluetooth/HID
- bluetooth4/HOGP-mouse certification-status=non-blocker
- bluetooth4/HOGP-keyboard certification-status=non-blocker
+nested_part:
+ com.canonical.certification::bluetooth-cert-manual
+ com.canonical.certification::bluetooth-cert-automated
+
+id: bluetooth-cert-manual
+unit: test plan
+_name: Bluetooth tests (Manual)
+_description:
+ Bluetooth tests (Manual)
+include:
+ bluetooth/audio-a2dp certification-status=blocker
+ bluetooth/HID
+ bluetooth4/HOGP-mouse certification-status=non-blocker
+ bluetooth4/HOGP-keyboard certification-status=non-blocker
+
 
 id: bluetooth-cert-automated
 unit: test plan
diff --git a/units/camera/test-plan.pxu b/units/camera/test-plan.pxu
index 2cf5550..e4302be 100644
--- a/units/camera/test-plan.pxu
+++ b/units/camera/test-plan.pxu
@@ -1,12 +1,22 @@
 id: camera-cert-full
 unit: test plan
 _name: Camera tests
-_description: Camera tests
+_description:
+ Camera tests
 include:
- camera/detect certification-status=blocker
- camera/still certification-status=blocker
- camera/display certification-status=blocker
- camera/multiple-resolution-images certification-status=blocker
+nested_part:
+ com.canonical.certification::camera-cert-manual
+ com.canonical.certification::camera-cert-automated
+
+id: camera-cert-manual
+unit: test plan
+_name: Camera tests (Manual)
+_description:
+ Camera tests (Manual)
+include:
+ camera/still certification-status=blocker
+ camera/display certification-status=blocker
+
 
 id: after-suspend-camera-cert-full
 unit: test plan
diff --git a/units/cpu/test-plan.pxu b/units/cpu/test-plan.pxu
index 2678c31..c20efe8 100644
--- a/units/cpu/test-plan.pxu
+++ b/units/cpu/test-plan.pxu
@@ -1,11 +1,23 @@
 id: cpu-cert-full
 unit: test plan
 _name: CPU tests
-_description: CPU tests
+_description:
+ CPU tests
+include:
+nested_part:
+ com.canonical.certification::cpu-cert-manual
+ com.canonical.certification::cpu-cert-automated
+
+id: cpu-cert-manual
+unit: test plan
+_name: CPU tests (Manual)
+_description:
+ CPU tests (Manual)
 include:
 nested_part:
 cpu-cert-automated
 
+
 id: cpu-cert-automated
 unit: test plan
 _name: CPU tests (automated)
diff --git a/units/esata/test-plan.pxu b/units/esata/test-plan.pxu
index b7e59cd..e2cc21c 100644
--- a/units/esata/test-plan.pxu
+++ b/units/esata/test-plan.pxu
@@ -1,11 +1,30 @@
 id: esata-cert-full
 unit: test plan
 _name: eSATA tests
-_description: eSATA tests
+_description:
+ eSATA tests
 include:
- esata/insert certification-status=blocker
- esata/storage-test certification-status=blocker
- esata/remove certification-status=blocker
+nested_part:
+ com.canonical.certification::esata-cert-manual
+ com.canonical.certification::esata-cert-automated
+
+id: esata-cert-manual
+unit: test plan
+_name: eSATA tests (Manual)
+_description:
+ eSATA tests (Manual)
+include:
+ esata/insert certification-status=blocker
+ esata/storage-test certification-status=blocker
+ esata/remove certification-status=blocker
+
+id: esata-cert-automated
+unit: test plan
+_name: eSATA tests (Automated)
+_description:
+ eSATA tests (Automated)
+include:
+
 
 id: esata-cert-blockers
 unit: test plan
diff --git a/units/firewire/test-plan.pxu b/units/firewire/test-plan.pxu
index ecb6084..66de049 100644
--- a/units/firewire/test-plan.pxu
+++ b/units/firewire/test-plan.pxu
@@ -1,11 +1,30 @@
 id: firewire-cert-full
 unit: test plan
 _name: Firewire tests
-_description: Firewire tests
+_description:
+ Firewire tests
 include:
- firewire/insert certification-status=blocker
- firewire/storage-test certification-status=blocker
- firewire/remove certification-status=blocker
+nested_part:
+ com.canonical.certification::firewire-cert-manual
+ com.canonical.certification::firewire-cert-automated
+
+id: firewire-cert-manual
+unit: test plan
+_name: Firewire tests (Manual)
+_description:
+ Firewire tests (Manual)
+include:
+ firewire/insert certification-status=blocker
+ firewire/storage-test certification-status=blocker
+ firewire/remove certification-status=blocker
+
+id: firewire-cert-automated
+unit: test plan
+_name: Firewire tests (Automated)
+_description:
+ Firewire tests (Automated)
+include:
+
 
 id: firewire-cert-blockers
 unit: test plan
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index a85b194..aa7ddde 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -1,42 +1,88 @@
 id: graphics-integrated-gpu-cert-full
 unit: test plan
 _name: Graphics tests (integrated GPU)
-_description: Graphics tests (integrated GPU)
+_description:
+ Graphics tests (integrated GPU)
 include:
- miscellanea/chvt
- 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
- graphics/1_minimum_resolution_.*
- graphics/1_cycle_resolution_.* certification-status=non-blocker
+bootstrap_include:
+ graphics_card
+nested_part:
+ com.canonical.certification::graphics-integrated-gpu-cert-manual
+ com.canonical.certification::graphics-integrated-gpu-cert-automated
+
+id: graphics-integrated-gpu-cert-manual
+unit: test plan
+_name: Graphics tests (integrated GPU) (Manual)
+_description:
+ Graphics tests (integrated GPU) (Manual)
+include:
+ miscellanea/chvt
+ graphics/1_maximum_resolution_.* certification-status=blocker
+ graphics/1_glxgears_.* certification-status=blocker
+ graphics/1_rotation_.* certification-status=blocker
+ graphics/1_video_.* certification-status=blocker
+ graphics/1_cycle_resolution_.* certification-status=non-blocker
+bootstrap_include:
+ graphics_card
+
+id: graphics-integrated-gpu-cert-automated
+unit: test plan
+_name: Graphics tests (integrated GPU) (Automated)
+_description:
+ Graphics tests (integrated GPU) (Automated)
+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_driver_version_.* certification-status=blocker
+ graphics/1_compiz_check_.* certification-status=blocker
+ graphics/1_minimum_resolution_.*
 bootstrap_include:
 graphics_card
 
+
 id: graphics-discrete-gpu-cert-full
 unit: test plan
 _name: Graphics tests (discrete GPU)
-_description: Graphics tests (discrete GPU)
+_description:
+ Graphics tests (discrete GPU)
 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
- graphics/2_minimum_resolution_.*
- graphics/2_cycle_resolution_.* certification-status=non-blocker
+bootstrap_include:
+ graphics_card
+nested_part:
+ com.canonical.certification::graphics-discrete-gpu-cert-manual
+ com.canonical.certification::graphics-discrete-gpu-cert-automated
+
+id: graphics-discrete-gpu-cert-manual
+unit: test plan
+_name: Graphics tests (discrete GPU) (Manual)
+_description:
+ Graphics tests (discrete GPU) (Manual)
+include:
+ graphics/2_switch_card_.*_xenial certification-status=blocker
+ graphics/2_maximum_resolution_.* certification-status=blocker
+ graphics/2_glxgears_.* certification-status=blocker
+ graphics/2_rotation_.* certification-status=blocker
+ graphics/2_video_.* certification-status=blocker
+ graphics/2_cycle_resolution_.* certification-status=non-blocker
 bootstrap_include:
 graphics_card
 
+id: graphics-discrete-gpu-cert-automated
+unit: test plan
+_name: Graphics tests (discrete GPU) (Automated)
+_description:
+ Graphics tests (discrete GPU) (Automated)
+include:
+ graphics/2_valid_opengl_renderer_.* certification-status=blocker
+ graphics/2_driver_version_.* certification-status=blocker
+ graphics/2_compiz_check_.* certification-status=blocker
+ graphics/2_minimum_resolution_.*
+bootstrap_include:
+ graphics_card
+
+
 id: after-suspend-graphics-integrated-gpu-cert-full
 unit: test plan
 _name: After suspend tests (integrated GPU)
diff --git a/units/info/test-plan.pxu b/units/info/test-plan.pxu
index c01d47e..e54b443 100644
--- a/units/info/test-plan.pxu
+++ b/units/info/test-plan.pxu
@@ -1,32 +1,55 @@
 id: info-attachment-cert-full
 unit: test plan
 _name: Info attachment jobs
-_description: Info attachment jobs
+_description:
+ Info attachment jobs
 include:
- acpi_sleep_attachment
- codecs_attachment
- cpuinfo_attachment
- dkms_info_attachment
- dmesg_attachment
- dmi_attachment
- dmidecode_attachment
- efi_attachment
- info/buildstamp
- info/disk_partitions
- info/hdparm_.*.txt
- info/touchpad_driver
- installer_debug.gz
- kernel_cmdline_attachment
- lsmod_attachment
- lspci_attachment
- lspci_standard_config_attachment
- lsusb_attachment
- meminfo_attachment
- modinfo_attachment
- modprobe_attachment
- modules_attachment
- sysctl_attachment
- sysfs_attachment
- udev_attachment
+bootstrap_include:
+ device
+nested_part:
+ com.canonical.certification::info-attachment-cert-manual
+ com.canonical.certification::info-attachment-cert-automated
+
+id: info-attachment-cert-manual
+unit: test plan
+_name: Info attachment jobs (Manual)
+_description:
+ Info attachment jobs (Manual)
+include:
+bootstrap_include:
+ device
+
+id: info-attachment-cert-automated
+unit: test plan
+_name: Info attachment jobs (Automated)
+_description:
+ Info attachment jobs (Automated)
+include:
+ acpi_sleep_attachment
+ codecs_attachment
+ cpuinfo_attachment
+ dkms_info_attachment
+ dmesg_attachment
+ dmi_attachment
+ dmidecode_attachment
+ efi_attachment
+ info/buildstamp
+ info/disk_partitions
+ info/hdparm_.*.txt
+ info/touchpad_driver
+ installer_debug.gz
+ kernel_cmdline_attachment
+ lsmod_attachment
+ lspci_attachment
+ lspci_standard_config_attachment
+ lsusb_attachment
+ meminfo_attachment
+ modinfo_attachment
+ modprobe_attachment
+ modules_attachment
+ sysctl_attachment
+ sysfs_attachment
+ udev_attachment
 bootstrap_include:
 device
+
diff --git a/units/input/test-plan.pxu b/units/input/test-plan.pxu
index 8033883..ef9cf75 100644
--- a/units/input/test-plan.pxu
+++ b/units/input/test-plan.pxu
@@ -1,12 +1,29 @@
 id: input-cert-full
 unit: test plan
 _name: Input tests
-_description: Input tests
+_description:
+ Input tests
 include:
- input/accelerometer certification-status=non-blocker
- input/pointing_.* certification-status=blocker
- input/clicking_.* certification-status=blocker
- input/keyboard certification-status=blocker
+nested_part:
+ com.canonical.certification::input-cert-manual
+ com.canonical.certification::input-cert-automated
+
+id: input-cert-manual
+unit: test plan
+_name: Input tests (Manual)
+_description:
+ Input tests (Manual)
+include:
+ input/accelerometer certification-status=non-blocker
+ input/keyboard certification-status=blocker
+
+id: input-cert-automated
+unit: test plan
+_name: Input tests (Automated)
+_description:
+ Input tests (Automated)
+include:
+
 
 id: after-suspend-input-cert-full
 unit: test plan
diff --git a/units/keys/test-plan.pxu b/units/keys/test-plan.pxu
index 4fd7092..c75a32a 100644
--- a/units/keys/test-plan.pxu
+++ b/units/keys/test-plan.pxu
@@ -4,17 +4,35 @@ _name: Special keys tests
 _description:
 Special keys tests (w/o sleep/hibernate keys, see Power Management test plans)
 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
- keys/keyboard-backlight certification-status=blocker
- keys/microphone-mute certification-status=blocker
+nested_part:
+ com.canonical.certification::keys-cert-manual
+ com.canonical.certification::keys-cert-automated
+
+id: keys-cert-manual
+unit: test plan
+_name: Special keys tests (Manual)
+_description:
+ Special keys tests (w/o sleep/hibernate keys, see Power Management test plans) (Manual)
+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
+ keys/keyboard-backlight certification-status=blocker
+ keys/microphone-mute certification-status=blocker
+
+id: keys-cert-automated
+unit: test plan
+_name: Special keys tests (Automated)
+_description:
+ Special keys tests (w/o sleep/hibernate keys, see Power Management test plans) (Automated)
+include:
+
 
 id: after-suspend-keys-cert-full
 unit: test plan
diff --git a/units/led/test-plan.pxu b/units/led/test-plan.pxu
index f43a3ca..88d38a6 100644
--- a/units/led/test-plan.pxu
+++ b/units/led/test-plan.pxu
@@ -2,19 +2,45 @@ id: led-cert-full
 unit: test plan
 _name: LED tests
 _description:
+ LED tests
+ Notes: - led/power-blink-suspend and led/suspend are used later in the
+ power management testplan just after a number of suspend tests.
+ - led/wireless is redundant given that we have led/wlan and
+ led/bluetooth already.
+include:
+nested_part:
+ com.canonical.certification::led-cert-manual
+ com.canonical.certification::led-cert-automated
+
+id: led-cert-manual
+unit: test plan
+_name: LED tests (Manual)
+_description:
 LED tests
 Notes: - led/power-blink-suspend and led/suspend are used later in the
 power management testplan just after a number of suspend tests.
 - led/wireless is redundant given that we have led/wlan and
- led/bluetooth already.
+ led/bluetooth already. (Manual)
 include:
- led/battery-charged
- led/battery-charging
- led/battery-low
- led/camera
- led/caps-lock
- led/power
- led/touchpad
+ led/battery-charged
+ led/battery-charging
+ led/battery-low
+ led/camera
+ led/caps-lock
+ led/power
+ led/touchpad
+
+id: led-cert-automated
+unit: test plan
+_name: LED tests (Automated)
+_description:
+ LED tests
+ Notes: - led/power-blink-suspend and led/suspend are used later in the
+ power management testplan just after a number of suspend tests.
+ - led/wireless is redundant given that we have led/wlan and
+ led/bluetooth already. (Automated)
+include:
+
 
 id: after-suspend-led-cert-full
 unit: test plan
diff --git a/units/mediacard/test-plan.pxu b/units/mediacard/test-plan.pxu
index 087e556..58d3f07 100644
--- a/units/mediacard/test-plan.pxu
+++ b/units/mediacard/test-plan.pxu
@@ -1,14 +1,33 @@
 id: mediacard-cert-full
 unit: test plan
 _name: Mediacard tests
-_description: Mediacard tests
+_description:
+ Mediacard tests
 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
+nested_part:
+ com.canonical.certification::mediacard-cert-manual
+ com.canonical.certification::mediacard-cert-automated
+
+id: mediacard-cert-manual
+unit: test plan
+_name: Mediacard tests (Manual)
+_description:
+ Mediacard tests (Manual)
+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: mediacard-cert-automated
+unit: test plan
+_name: Mediacard tests (Automated)
+_description:
+ Mediacard tests (Automated)
+include:
+
 
 id: after-suspend-mediacard-cert-full
 unit: test plan
diff --git a/units/miscellanea/test-plan.pxu b/units/miscellanea/test-plan.pxu
index adf771f..758386e 100644
--- a/units/miscellanea/test-plan.pxu
+++ b/units/miscellanea/test-plan.pxu
@@ -1,11 +1,23 @@
 id: misc-client-cert-full
 unit: test plan
 _name: Miscellaneous client tests
-_description: Miscellaneous client tests (fwts, dmi, oops)
+_description:
+ Miscellaneous client tests (fwts, dmi, oops)
+include:
+nested_part:
+ com.canonical.certification::misc-client-cert-manual
+ com.canonical.certification::misc-client-cert-automated
+
+id: misc-client-cert-manual
+unit: test plan
+_name: Miscellaneous client tests (Manual)
+_description:
+ Miscellaneous client tests (fwts, dmi, oops) (Manual)
 include:
 nested_part:
 misc-client-cert-automated
 
+
 id: misc-client-cert-automated
 unit: test plan
 _name: Miscellaneous client tests (automated)
diff --git a/units/mobilebroadband/test-plan.pxu b/units/mobilebroadband/test-plan.pxu
index 166a297..dd086c7 100644
--- a/units/mobilebroadband/test-plan.pxu
+++ b/units/mobilebroadband/test-plan.pxu
@@ -1,11 +1,23 @@
 id: mobilebroadband-cert-full
 unit: test plan
 _name: Mobile broadband tests
-_description: Mobile broadband tests
+_description:
+ Mobile broadband tests
+include:
+nested_part:
+ com.canonical.certification::mobilebroadband-cert-manual
+ com.canonical.certification::mobilebroadband-cert-automated
+
+id: mobilebroadband-cert-manual
+unit: test plan
+_name: Mobile broadband tests (Manual)
+_description:
+ Mobile broadband tests (Manual)
 include:
 nested_part:
 mobilebroadband-cert-automated
 
+
 id: mobilebroadband-cert-automated
 unit: test plan
 _name: Mobile broadband tests (automated)
diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu
index 10976c9..a642040 100644
--- a/units/monitor/test-plan.pxu
+++ b/units/monitor/test-plan.pxu
@@ -1,51 +1,97 @@
 id: monitor-integrated-gpu-cert-full
 unit: test plan
 _name: Monitor tests (integrated GPU)
-_description: Monitor tests (integrated GPU)
+_description:
+ Monitor tests (integrated GPU)
 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=non-blocker
- audio/1_playback_displayport_.* certification-status=blocker
- audio/1_playback_type-c_displayport_.* certification-status=non-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
+nested_part:
+ com.canonical.certification::monitor-integrated-gpu-cert-manual
+ com.canonical.certification::monitor-integrated-gpu-cert-automated
+
+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=non-blocker
+ audio/1_playback_displayport_.* certification-status=blocker
+ audio/1_playback_type-c_displayport_.* certification-status=non-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: monitor-integrated-gpu-cert-automated
+unit: test plan
+_name: Monitor tests (integrated GPU) (Automated)
+_description:
+ Monitor tests (integrated GPU) (Automated)
+include:
+bootstrap_include:
+ graphics_card
+
+
 id: monitor-discrete-gpu-cert-full
 unit: test plan
 _name: Monitor tests (discrete GPU)
-_description: Monitor tests (discrete GPU)
+_description:
+ Monitor tests (discrete GPU)
+include:
+bootstrap_include:
+ graphics_card
+nested_part:
+ com.canonical.certification::monitor-discrete-gpu-cert-manual
+ com.canonical.certification::monitor-discrete-gpu-cert-automated
+
+id: monitor-discrete-gpu-cert-manual
+unit: test plan
+_name: Monitor tests (discrete GPU) (Manual)
+_description:
+ Monitor tests (discrete GPU) (Manual)
+include:
+ monitor/2_powersaving_.* certification-status=blocker
+ monitor/2_dim_brightness_.* certification-status=blocker
+ monitor/2_displayport_.* certification-status=blocker
+ monitor/2_type-c_displayport_.* certification-status=non-blocker
+ audio/2_playback_displayport_.* certification-status=blocker
+ audio/2_playback_type-c_displayport_.* certification-status=non-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
+ monitor/2_thunderbolt3_.* certification-status=non-blocker
+ audio/2_playback_thunderbolt_.* certification-status=blocker
+ audio/2_playback_thunderbolt3_.* certification-status=non-blocker
+ monitor/2_vga_.* certification-status=blocker
+ monitor/2_multi-head_.* certification-status=blocker
+bootstrap_include:
+ graphics_card
+
+id: monitor-discrete-gpu-cert-automated
+unit: test plan
+_name: Monitor tests (discrete GPU) (Automated)
+_description:
+ Monitor tests (discrete GPU) (Automated)
 include:
- monitor/2_powersaving_.* certification-status=blocker
- monitor/2_dim_brightness_.* certification-status=blocker
- monitor/2_displayport_.* certification-status=blocker
- monitor/2_type-c_displayport_.* certification-status=non-blocker
- audio/2_playback_displayport_.* certification-status=blocker
- audio/2_playback_type-c_displayport_.* certification-status=non-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
- monitor/2_thunderbolt3_.* certification-status=non-blocker
- audio/2_playback_thunderbolt_.* certification-status=blocker
- audio/2_playback_thunderbolt3_.* certification-status=non-blocker
- monitor/2_vga_.* certification-status=blocker
- 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)
diff --git a/units/networking/test-plan.pxu b/units/networking/test-plan.pxu
index ade662a..e9e61e2 100644
--- a/units/networking/test-plan.pxu
+++ b/units/networking/test-plan.pxu
@@ -12,7 +12,7 @@ unit: test plan
 _name: Networking tests (manual)
 _description: Networking tests (manual)
 include:
- networking/info.* certification-status=blocker
+ networking/info_device.* certification-status=blocker
 
 id: networking-cert-automated
 unit: test plan
@@ -30,5 +30,5 @@ _description: Networking tests (certification blockers only)
 include:
 ethernet/detect certification-status=blocker
 networking/gateway_ping certification-status=blocker
- networking/info.* certification-status=blocker
+ networking/info_device.* certification-status=blocker
 networking/ntp certification-status=blocker
diff --git a/units/optical/test-plan.pxu b/units/optical/test-plan.pxu
index 0cc6ab3..2e53d79 100644
--- a/units/optical/test-plan.pxu
+++ b/units/optical/test-plan.pxu
@@ -1,14 +1,37 @@
 id: optical-cert-full
 unit: test plan
 _name: Optical drive tests
-_description: Optical drive tests
+_description:
+ Optical drive tests
 include:
- optical/detect certification-status=blocker
- optical/read_.* certification-status=blocker
- optical/bluray-read_.* certification-status=blocker
+bootstrap_include:
+ device
+nested_part:
+ com.canonical.certification::optical-cert-manual
+ com.canonical.certification::optical-cert-automated
+
+id: optical-cert-manual
+unit: test plan
+_name: Optical drive tests (Manual)
+_description:
+ Optical drive tests (Manual)
+include:
+ optical/read_.* certification-status=blocker
+ optical/bluray-read_.* certification-status=blocker
 bootstrap_include:
 device
 
+id: optical-cert-automated
+unit: test plan
+_name: Optical drive tests (Automated)
+_description:
+ Optical drive tests (Automated)
+include:
+ optical/detect certification-status=blocker
+bootstrap_include:
+ device
+
+
 id: optical-cert-blockers
 unit: test plan
 _name: Optical drive tests (certification blockers only)
diff --git a/units/stress/test-plan.pxu b/units/stress/test-plan.pxu
index 5581401..659e04e 100644
--- a/units/stress/test-plan.pxu
+++ b/units/stress/test-plan.pxu
@@ -1,11 +1,27 @@
 id: stress-cert-full
 unit: test plan
 _name: Stress tests
-_description: Stress tests
+_description:
+ Stress tests
 include:
 nested_part:
+ com.canonical.certification::stress-cert-manual
+ com.canonical.certification::stress-cert-automated
+
+id: stress-cert-manual
+unit: test plan
+_name: Stress tests (Manual)
+_description:
+ Stress tests (Manual)
+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
+nested_part:
 stress-cert-automated
 
+
 id: stress-cert-automated
 unit: test plan
 _name: Stress tests (automated)
diff --git a/units/thunderbolt/test-plan.pxu b/units/thunderbolt/test-plan.pxu
index 054bb26..d5dc001 100644
--- a/units/thunderbolt/test-plan.pxu
+++ b/units/thunderbolt/test-plan.pxu
@@ -1,14 +1,33 @@
 id: thunderbolt-cert-full
 unit: test plan
 _name: Thunderbolt tests
-_description: Thunderbolt tests
+_description:
+ Thunderbolt tests
 include:
- thunderbolt/insert certification-status=blocker
- thunderbolt/storage-test certification-status=blocker
- thunderbolt/remove certification-status=blocker
- thunderbolt3/insert certification-status=non-blocker
- thunderbolt3/storage-test certification-status=non-blocker
- thunderbolt3/remove certification-status=non-blocker
+nested_part:
+ com.canonical.certification::thunderbolt-cert-manual
+ com.canonical.certification::thunderbolt-cert-automated
+
+id: thunderbolt-cert-manual
+unit: test plan
+_name: Thunderbolt tests (Manual)
+_description:
+ Thunderbolt tests (Manual)
+include:
+ thunderbolt/insert certification-status=blocker
+ thunderbolt/storage-test certification-status=blocker
+ thunderbolt/remove certification-status=blocker
+ thunderbolt3/insert certification-status=non-blocker
+ thunderbolt3/storage-test certification-status=non-blocker
+ thunderbolt3/remove certification-status=non-blocker
+
+id: thunderbolt-cert-automated
+unit: test plan
+_name: Thunderbolt tests (Automated)
+_description:
+ Thunderbolt tests (Automated)
+include:
+
 
 id: thunderbolt-cert-blockers
 unit: test plan
diff --git a/units/touchpad/test-plan.pxu b/units/touchpad/test-plan.pxu
index 7514991..78d7fa6 100644
--- a/units/touchpad/test-plan.pxu
+++ b/units/touchpad/test-plan.pxu
@@ -1,23 +1,42 @@
 id: touchpad-cert-full
 unit: test plan
 _name: Touchpad tests
-_description: Touchpad tests
+_description:
+ Touchpad tests
 include:
- touchpad/basic certification-status=blocker
- touchpad/detected-as-mouse certification-status=blocker
- touchpad/palm-rejection certification-status=non-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
- touchpad/multitouch-dash certification-status=non-blocker
+nested_part:
+ com.canonical.certification::touchpad-cert-manual
+ com.canonical.certification::touchpad-cert-automated
+
+id: touchpad-cert-manual
+unit: test plan
+_name: Touchpad tests (Manual)
+_description:
+ Touchpad tests (Manual)
+include:
+ touchpad/basic certification-status=blocker
+ touchpad/palm-rejection certification-status=non-blocker
+ touchpad/continuous-move certification-status=blocker
+ touchpad/horizontal certification-status=blocker
+ touchpad/vertical certification-status=blocker
+ touchpad/singletouch-selection certification-status=blocker
+ touchpad/drag-and-drop 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
+ touchpad/multitouch-dash certification-status=non-blocker
+
+id: touchpad-cert-automated
+unit: test plan
+_name: Touchpad tests (Automated)
+_description:
+ Touchpad tests (Automated)
+include:
+ touchpad/detected-as-mouse certification-status=blocker
+ touchpad/singletouch-automated certification-status=blocker
+ touchpad/multitouch-automated certification-status=blocker
+
 
 id: after-suspend-touchpad-cert-full
 unit: test plan
diff --git a/units/touchscreen/test-plan.pxu b/units/touchscreen/test-plan.pxu
index e984af9..1682136 100644
--- a/units/touchscreen/test-plan.pxu
+++ b/units/touchscreen/test-plan.pxu
@@ -1,14 +1,33 @@
 id: touchscreen-cert-full
 unit: test plan
 _name: Touchscreen tests
-_description: Touchscreen tests
+_description:
+ Touchscreen tests
 include:
- touchscreen/drag-n-drop certification-status=blocker
- touchscreen/multitouch-zoom certification-status=blocker
- touchscreen/multitouch-rotate
- touchscreen/3-touch-tap certification-status=blocker
- touchscreen/4-touch-tap certification-status=blocker
- touchscreen/multitouch-dash certification-status=non-blocker
+nested_part:
+ com.canonical.certification::touchscreen-cert-manual
+ com.canonical.certification::touchscreen-cert-automated
+
+id: touchscreen-cert-manual
+unit: test plan
+_name: Touchscreen tests (Manual)
+_description:
+ Touchscreen tests (Manual)
+include:
+ touchscreen/drag-n-drop certification-status=blocker
+ touchscreen/multitouch-zoom certification-status=blocker
+ touchscreen/multitouch-rotate
+ touchscreen/3-touch-tap certification-status=blocker
+ touchscreen/4-touch-tap certification-status=blocker
+ touchscreen/multitouch-dash certification-status=non-blocker
+
+id: touchscreen-cert-automated
+unit: test plan
+_name: Touchscreen tests (Automated)
+_description:
+ Touchscreen tests (Automated)
+include:
+
 
 id: touchscreen-cert-blockers
 unit: test plan
diff --git a/units/usb/test-plan.pxu b/units/usb/test-plan.pxu
index 5b4e88b..27a0616 100644
--- a/units/usb/test-plan.pxu
+++ b/units/usb/test-plan.pxu
@@ -1,22 +1,60 @@
 id: usb-cert-full
 unit: test plan
 _name: USB tests
-_description: USB tests
+_description:
+ USB tests
 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
+nested_part:
+ com.canonical.certification::usb-cert-manual
+ com.canonical.certification::usb-cert-automated
+
+id: usb-cert-manual
+unit: test plan
+_name: USB tests (Manual)
+_description:
+ USB tests (Manual)
+include:
+ usb/HID certification-status=blocker
+ usb/insert certification-status=blocker
+ usb/storage-automated certification-status=blocker
+ usb/remove certification-status=blocker
+
+id: usb-cert-automated
+unit: test plan
+_name: USB tests (Automated)
+_description:
+ USB tests (Automated)
+include:
+ usb/detect certification-status=blocker
+
 
 id: usb3-cert-full
 unit: test plan
 _name: USB3 tests
-_description: USB3 tests
+_description:
+ USB3 tests
 include:
- usb3/insert certification-status=blocker
- usb3/storage-automated certification-status=blocker
- usb3/remove certification-status=blocker
+nested_part:
+ com.canonical.certification::usb3-cert-manual
+ com.canonical.certification::usb3-cert-automated
+
+id: usb3-cert-manual
+unit: test plan
+_name: USB3 tests (Manual)
+_description:
+ USB3 tests (Manual)
+include:
+ usb3/insert certification-status=blocker
+ usb3/storage-automated certification-status=blocker
+ usb3/remove certification-status=blocker
+
+id: usb3-cert-automated
+unit: test plan
+_name: USB3 tests (Automated)
+_description:
+ USB3 tests (Automated)
+include:
+
 
 id: usb-c-cert-full
 unit: test plan
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index ee921df..74bf271 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -1,11 +1,23 @@
 id: wireless-cert-full
 unit: test plan
 _name: Wireless tests
-_description: Wireless connection tests
+_description:
+ Wireless connection tests
+include:
+nested_part:
+ com.canonical.certification::wireless-cert-manual
+ com.canonical.certification::wireless-cert-automated
+
+id: wireless-cert-manual
+unit: test plan
+_name: Wireless tests (Manual)
+_description:
+ Wireless connection tests (Manual)
 include:
 nested_part:
 wireless-cert-automated
 
+
 id: after-suspend-wireless-cert-full
 unit: test plan
 _name: Wireless tests (after suspend)