Merge #372333 from ~huntu207/oem-qa-checkbox/+git/oem-plainbox:modify-somerville-graphic-stress

2 files changed, 9 insertions, 75 deletions

diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index 5a8abdc..ef00497 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-06
 id: somerville-graphic
 _name: Somerville Graphic
 unit: test plan
@@ -6,81 +6,19 @@ _description: Somerville Graphic
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
- com.canonical.certification::recovery_info_attachment
 somerville/dkms-build-exclusive-test
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/query-bto-version
- somerville/manifest_version
 somerville/dell-repository
 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
- 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
+ oem-generic-graphic
 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
- # with.
 com.canonical.certification::power-management-reboot-poweroff-cert
- # Automated Tests
- # The following tests are purely automated and/or lenghty stress tests.
- # They have been moved to the end of the test run to improve the testing
- # process.
 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
- com.canonical.certification::suspend/bluetooth_obex_get_before_suspend
- com.canonical.certification::bluetooth4/beacon_eddystone_url_hci0
- com.canonical.certification::bluetooth/detect-output
- com.canonical.certification::suspend/bluetooth_detect_after_suspend
- com.canonical.certification::suspend/bluetooth_obex_send_after_suspend
- com.canonical.certification::suspend/bluetooth_obex_browse_after_suspend
- com.canonical.certification::suspend/bluetooth_obex_get_after_suspend
diff --git a/units/somerville-stress.pxu b/units/somerville-stress.pxu
index 387feca..e742979 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-06
 id: somerville-stress
 _name: Somerville Stress
 unit: test plan
@@ -6,17 +6,13 @@ _description: Somerville Stress
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
- com.canonical.certification::recovery_info_attachment
+ somerville/dkms-build-exclusive-test
+ somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/query-bto-version
- somerville/manifest_version
- com.canonical.certification::suspend/suspend_advanced certification-status=blocker
+ somerville/dell-repository
+ somerville/platform-meta-test-bios-id
+ somerville/desktop-kpi-dashboard
 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