Merge #368639 from ~ray.chen/plainbox-provider-checkbox:lp1812167-add-monitor-tests-to-dgpu-test-plan

2 files changed, 92 insertions, 8 deletions

diff --git a/units/monitor/jobs.pxu b/units/monitor/jobs.pxu
index 64f902d..54a86c9 100644
--- a/units/monitor/jobs.pxu
+++ b/units/monitor/jobs.pxu
@@ -230,6 +230,50 @@ _verification:
 Was the desktop displayed correctly with {vendor} {product} on the screen
 connected using a "USB Type-C to DisplayPort" adapter in every mode?
 
+unit: template
+template-resource: graphics_card
+id: monitor/{index}_type-c_hdmi_{product_slug}
+template-filter: graphics_card.prime_gpu_offload == 'Off'
+imports: from com.canonical.plainbox import manifest
+requires: manifest.has_usb_type_c == 'True'
+flags: also-after-suspend-manual
+estimated_duration: 15.0
+plugin: manual
+category_id: com.canonical.plainbox::monitor
+_summary: Display connected via HDMI using an USB Type-C port for {vendor} {product}
+_purpose:
+ This test will check the connection of a screen using a "USB Type-C to HDMI" adapter for {vendor} {product}.
+_steps:
+ 1. Connect a display (if not already connected) to the USB Type-C port on
+ your system using a "USB Type-C to HDMI" adapter
+ 2. Switch display modes between in your Display Settings, check if it can be
+ set to mirrored, extended, displayed on external or onboard only
+_verification:
+ Was the desktop displayed correctly with {vendor} {product} on the screen
+ connected using a "USB Type-C to HDMI" adapter in every mode?
+
+unit: template
+template-resource: graphics_card
+id: monitor/{index}_type-c_vga_{product_slug}
+template-filter: graphics_card.prime_gpu_offload == 'Off'
+imports: from com.canonical.plainbox import manifest
+requires: manifest.has_usb_type_c == 'True'
+flags: also-after-suspend-manual
+estimated_duration: 15.0
+plugin: manual
+category_id: com.canonical.plainbox::monitor
+_summary: Display connected via VGA using an USB Type-C port for {vendor} {product}
+_purpose:
+ This test will check the connection of a screen using a "USB Type-C to VGA" adapter for {vendor} {product}.
+_steps:
+ 1. Connect a display (if not already connected) to the USB Type-C port on
+ your system using a "USB Type-C to VGA" adapter
+ 2. Switch display modes between in your Display Settings, check if it can be
+ set to mirrored, extended, displayed on external or onboard only
+_verification:
+ Was the desktop displayed correctly with {vendor} {product} on the screen
+ connected using a "USB Type-C to VGA" adapter in every mode?
+
 id: monitor/type-c-to-hdmi
 imports: from com.canonical.plainbox import manifest
 requires: manifest.has_usb_type_c == 'True'
diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu
index d18fcbf..c70b03a 100644
--- a/units/monitor/test-plan.pxu
+++ b/units/monitor/test-plan.pxu
@@ -30,10 +30,9 @@ include:
 audio/1_playback_displayport_.* certification-status=blocker
 monitor/1_type-c_displayport_.* certification-status=blocker
 audio/1_playback_type-c_displayport_.* certification-status=blocker
- monitor/type-c-to-hdmi certification-status=blocker
- # placeholder for monitor/1_type-c_hdmi_.*
+ monitor/1_type-c_hdmi_.* certification-status=blocker
 audio/1_playback_type-c_hdmi_.* certification-status=blocker
- monitor/type-c-to-vga certification-status=blocker
+ monitor/1_type-c_vga_.* certification-status=blocker
 monitor/1_dvi_.* certification-status=blocker
 monitor/1_hdmi_.* certification-status=blocker
 audio/1_playback_hdmi_.* certification-status=blocker
@@ -60,10 +59,9 @@ include:
 (after-suspend-manual-)?audio/1_playback_displayport_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_type-c_displayport_.* certification-status=blocker
 (after-suspend-manual-)?audio/1_playback_type-c_displayport_.* certification-status=blocker
- (after-suspend-manual-)?monitor/type-c-to-hdmi certification-status=blocker
- # placeholder for (after-suspend-manual-)?monitor/1_type-c_hdmi_.*
+ (after-suspend-manual-)?monitor/1_type-c_hdmi_.* certification-status=blocker
 (after-suspend-manual-)?audio/1_playback_type-c_hdmi_.* certification-status=blocker
- (after-suspend-manual-)?monitor/type-c-to-vga certification-status=blocker
+ (after-suspend-manual-)?monitor/1_type-c_vga_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_dvi_.* certification-status=blocker
 (after-suspend-manual-)?monitor/1_hdmi_.* certification-status=blocker
 (after-suspend-manual-)?audio/1_playback_hdmi_.* certification-status=blocker
@@ -109,21 +107,63 @@ 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=blocker
 audio/2_playback_displayport_.* certification-status=blocker
+ monitor/2_type-c_displayport_.* certification-status=blocker
 audio/2_playback_type-c_displayport_.* certification-status=blocker
+ monitor/2_type-c_hdmi_.* certification-status=blocker
+ audio/2_playback_type-c_hdmi_.* certification-status=blocker
+ monitor/2_type-c_vga_.* 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
- monitor/2_thunderbolt3_.* certification-status=non-blocker
 audio/2_playback_thunderbolt_.* certification-status=blocker
+ monitor/2_thunderbolt3_.* certification-status=non-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: after-suspend-monitor-discrete-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-discrete-gpu-cert-manual
+
+
+id: after-suspend-manual-monitor-discrete-gpu-cert-manual
+unit: test plan
+_name: Monitor tests (after manual suspend, discrete GPU) (Manual)
+_description:
+ Monitor tests (after manual suspend, discrete GPU) (Manual)
+include:
+ (after-suspend-manual-)?monitor/2_powersaving_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_dim_brightness_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_type-c_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_type-c_displayport_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_type-c_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_type-c_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_type-c_vga_.* certification-status=blocker 
+ (after-suspend-manual-)?monitor/2_dvi_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_hdmi_.* certification-status=blocker
+ (after-suspend-manual-)?monitor/2_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?audio/2_playback_thunderbolt_.* certification-status=blocker
+ (after-suspend-manual-)?thunderbolt/daisy-chain certification-status=blocker
+ (after-suspend-manual-)?monitor/2_thunderbolt3_.* certification-status=non-blocker
+ (after-suspend-manual-)?audio/2_playback_thunderbolt3_.* certification-status=non-blocker
+ (after-suspend-manual-)?thunderbolt3/daisy-chain certification-status=non-blocker
+ (after-suspend-manual-)?monitor/2_vga_.* certification-status=blocker
+ (after-suspend-manual-)?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)