Merge ~zongminl/checkbox-limerick/+git/checkbox-provider-limerick:add-4k-monitor-test into ~checkbox-dev/checkbox-limerick/+git/checkbox-provider-limerick:master

[Vic Liu]

1. Exclude the following VGA related monitor manual tests for there is no VGA port on limerick boards
      com.canonical.certification::monitor/vga
      com.canonical.certification::after-suspend-monitor/vga
2. Add 4K monitor manual hotplug test to test plan

Test result:
https://pastebin.canonical.com/p/W8CtgCPckZ/

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/units/monitor/jobs.pxu b/units/monitor/jobs.pxu
new file mode 100644
index 0000000..64a5cd0
--- /dev/null
+++ b/units/monitor/jobs.pxu
@@ -0,0 +1,14 @@
+id: monitor/displayport_4K_hotplug
+_summary: Can hotplug 4K monitor (DisplayPort)
+plugin: manual
+category_id: com.canonical.plainbox::monitor
+_purpose:
+     This test will check the DisplayPort port and the ability to do hotplugging on a 4K monitor.
+_steps:
+     Skip this test if your system does not have a DisplayPort port.
+     1. If a display is already connected, unplug it.
+     2. (Re-)Connect a 4K display to the DisplayPort port on your system
+_verification:
+     Was the interface displayed correctly on the screen?
+depends: com.canonical.certification::monitor/displayport_hotplug
+flags: also-after-suspend
diff --git a/units/monitor/test-plan.pxu b/units/monitor/test-plan.pxu
new file mode 100644
index 0000000..b44dcc0
--- /dev/null
+++ b/units/monitor/test-plan.pxu
@@ -0,0 +1,13 @@
+id: limerick-monitor-manual
+unit: test plan
+_name: Manual Limerick monitor test
+_description: Manual Limerick monitor tests
+include:
+    monitor/displayport_4K_hotplug
+
+id: limerick-after-suspend-monitor-manual
+unit: test plan
+_name: Manual Limerick monitor test (after suspend)
+_description: Manual Limerick monitor tests
+include:
+    after-suspend-monitor/displayport_4K_hotplug
diff --git a/units/test-plan-classic.pxu b/units/test-plan-classic.pxu
index 9544dcc..4d27334 100644
--- a/units/test-plan-classic.pxu
+++ b/units/test-plan-classic.pxu
@@ -57,6 +57,7 @@ nested_part:
     dtb-automated
     com.canonical.certification::ethernet-manual
     com.canonical.certification::monitor-manual
+    limerick-monitor-manual
     limerick-hdmi-in-manual
     com.canonical.certification::power-manual
     com.canonical.certification::serial-manual
@@ -66,6 +67,7 @@ nested_part:
     # com.canonical.certification::wireless-manual # covered by automated tests
     com.canonical.certification::graphics-integrated-gpu-cert-manual
     com.canonical.certification::after-suspend-monitor-manual
+    limerick-after-suspend-monitor-manual
     com.canonical.certification::after-suspend-usb-manual
     com.canonical.certification::after-suspend-usb3-manual
 exclude:
@@ -76,9 +78,11 @@ exclude:
     com.canonical.certification::monitor/dvi
     com.canonical.certification::monitor/dvi-to-vga
     com.canonical.certification::monitor/hdmi-to-vga
+    com.canonical.certification::monitor/vga
     com.canonical.certification::after-suspend-monitor/dvi
     com.canonical.certification::after-suspend-monitor/dvi-to-vga
     com.canonical.certification::after-suspend-monitor/hdmi-to-vga
+    com.canonical.certification::after-suspend-monitor/vga
 
 id: limerick-automated-classic
 unit: test plan