Modify sutton-full-16-04-osp1 test plan

Modify sutton-full-18-04 test plan Add test case desktop-kpi-dashboard 

2 files changed, 14 insertions, 13 deletions

diff --git a/units/sutton-full-16-04-osp1.pxu b/units/sutton-full-16-04-osp1.pxu
index 48f2e89..ad1598b 100644
--- a/units/sutton-full-16-04-osp1.pxu
+++ b/units/sutton-full-16-04-osp1.pxu
@@ -10,7 +10,7 @@ include:
 com.canonical.ce::sutton/sourceslist/project-timbuktu-base
 com.canonical.ce::sutton/sourceslist/subproject-bionic
 com.canonical.ce::sutton/infrared/infrared-camera-disabled
- com.canonical.ce::sutton/desktop/desktop-kpi-dashboard
+ com.canonical.ce::sutton/desktop-kpi-dashboard
 com.canonical.ce::sutton/specific/watermark
 nested_part:
 com.canonical.certification::submission-cert-full
diff --git a/units/sutton-full-18-04.pxu b/units/sutton-full-18-04.pxu
index 72c26d8..873c392 100644
--- a/units/sutton-full-18-04.pxu
+++ b/units/sutton-full-18-04.pxu
@@ -4,10 +4,14 @@ _description: Sutton Full
 unit: test plan
 include:
 com.canonical.certification::recovery_info_attachment
- com.canonical.ce::sutton/generic/sources-list/security
- com.canonical.ce::sutton/project/sources-list/project-base
- com.canonical.ce::sutton/project/sources-list/subproject
- com.canonical.ce::sutton/project/watermark
+ com.canonical.ce::sutton/sourceslist/security
+ com.canonical.ce::sutton/sourceslist/project-columbia-base
+ com.canonical.ce::sutton/sourceslist/subproject-xenial
+ com.canonical.ce::sutton/sourceslist/project-timbuktu-base
+ com.canonical.ce::sutton/sourceslist/subproject-bionic
+ com.canonical.ce::sutton/infrared/infrared-camera-disabled
+ com.canonical.ce::sutton/desktop-kpi-dashboard
+ com.canonical.ce::sutton/specific/watermark
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-full
@@ -39,7 +43,6 @@ nested_part:
 # Test discrete card first, if present, since it's the one we will be using
 # after coming back from suspend if the system has hybrid graphics.
 com.canonical.certification::after-suspend-graphics-discrete-gpu-cert-full
- com.canonical.certification::hibernate-discrete-gpu-cert-full
 # Now we ask to switch to the integrated graphics card. This requires a
 # restart of checkbox.
 com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-full
@@ -55,7 +58,6 @@ nested_part:
 com.canonical.certification::after-suspend-usb3-cert-full
 com.canonical.certification::after-suspend-wireless-cert-full
 com.canonical.certification::after-suspend-keys-cert-full
- com.canonical.certification::hibernate-integrated-gpu-cert-full
 # The following tests should run BEFORE the automated tests. The reboot and
 # power off tests will also give us a clean system to start the stress run
 # with.
@@ -68,16 +70,15 @@ nested_part:
 com.canonical.certification::cpu-cert-full
 com.canonical.certification::disk-cert-automated
 com.canonical.certification::stress-cert-full
- # com.canonical.certification::memory/memory_stress_ng
- # com.canonical.certification::power-management/hibernate_advanced
- # com.canonical.certification::tpm2.0
+ com.canonical.certification::memory/memory_stress_ng
 com.canonical.certification::tpm2.0_3.0.4
 com.canonical.certification::info-attachment-cert-full
 mandatory_include:
 com.canonical.certification::miscellanea/tester-info
-#exclude:
+exclude:
 # com.canonical.certification::power-management/suspend-30-cycle.*
 # com.canonical.certification::power-management/suspend_30_cycle.*
-# com.canonical.certification::power-management/hibernate_30.*
-# com.canonical.certification::power-management/hibernate-30.*
+ com.canonical.certification::power-management/hibernate_30.*
+ com.canonical.certification::power-management/hibernate-30.*
 # com.canonical.certification::stress/cpu_stress_ng_test
+