modify: Somerville Graphic and Stress test plan

2 files changed, 4 insertions, 46 deletions

diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index 5a8abdc..34e7907 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.2 2019-06-14
+# Version: 1.1.0 2019-09-05
 id: somerville-graphic
 _name: Somerville Graphic
 unit: test plan
@@ -17,27 +17,11 @@ include:
 somerville/platform-meta-test-bios-id
 somerville/desktop-kpi-dashboard
 nested_part:
- com.canonical.certification::submission-cert-full
- com.canonical.certification::monitor-integrated-gpu-cert-full
- com.canonical.certification::graphics-integrated-gpu-cert-full
- com.canonical.certification::graphics-discrete-gpu-cert-full
- com.canonical.certification::monitor-discrete-gpu-cert-full
 com.canonical.certification::disk-cert-manual
- com.canonical.certification::keys-cert-full
 com.canonical.certification::networking-cert-full
+ oem-generic-graphic
 com.canonical.certification::power-management-precheck-cert
- com.canonical.certification::before-suspend-reference-cert-full
- # 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::after-suspend-monitor-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
- com.canonical.certification::after-suspend-monitor-integrated-gpu-cert-full
 com.canonical.certification::suspend-key-led-oops-check-cert
- com.canonical.certification::after-suspend-reference-cert-full
- com.canonical.certification::after-suspend-keys-cert-full
 power-management-s
 # 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
@@ -50,30 +34,9 @@ nested_part:
 com.canonical.certification::stress-suspend-30-cycles-with-reboots-automated
 com.canonical.certification::stress-ng-cert-automated
 com.canonical.certification::stress-30-reboot-poweroff-automated
- com.canonical.certification::misc-client-cert-full
 com.canonical.certification::disk-cert-automated
- com.canonical.certification::info-attachment-cert-full
 mandatory_include:
- com.canonical.certification::miscellanea/tester-info
 exclude:
- com.canonical.certification::keys/lock-screen
- com.canonical.certification::keys/super
- com.canonical.certification::keys/battery-info
- com.canonical.certification::keys/media-control
- com.canonical.certification::keys/mute
- com.canonical.certification::keys/volume
- com.canonical.certification::keys/wireless
- com.canonical.certification::keys/keyboard-backlight
- com.canonical.certification::keys/microphone-mute
- com.canonical.certification::after-suspend-manual-keys/lock-screen
- com.canonical.certification::after-suspend-manual-keys/super
- com.canonical.certification::after-suspend-manual-keys/battery-info
- com.canonical.certification::after-suspend-manual-keys/media-control
- com.canonical.certification::after-suspend-manual-keys/mute
- com.canonical.certification::after-suspend-manual-keys/volume
- com.canonical.certification::after-suspend-manual-keys/wireless
- com.canonical.certification::after-suspend-manual-keys/keyboard-backlight
- com.canonical.certification::after-suspend-manual-keys/microphone-mute
 com.canonical.certification::stress/cpu_stress_ng_test
 com.canonical.certification::suspend/bluetooth_obex_send_before_suspend
 com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend
diff --git a/units/somerville-stress.pxu b/units/somerville-stress.pxu
index 387feca..690e990 100644
--- a/units/somerville-stress.pxu
+++ b/units/somerville-stress.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.0 2018-09-12
+# Version: 1.1.0 2019-09-02
 id: somerville-stress
 _name: Somerville Stress
 unit: test plan
@@ -13,10 +13,5 @@ include:
 somerville/manifest_version
 com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 nested_part:
- com.canonical.certification::submission-cert-full
- com.canonical.certification::stress-suspend-30-cycles-with-reboots-automated
- com.canonical.certification::stress-ng-cert-automated
- com.canonical.certification::stress-30-reboot-poweroff-automated
- com.canonical.certification::info-attachment-cert-full
+ oem-generic-stress
 mandatory_include:
- com.canonical.certification::miscellanea/tester-info