Modify somerville full and regression test plan base on oem-generic-full and blocker

Modify somerville full and regression test plan base on oem-generic-full and blocker 

5 files changed, 10 insertions, 273 deletions

diff --git a/units/somerville-blocker.pxu b/units/somerville-blocker.pxu
deleted file mode 100644
index 713c0da..0000000
--- a/units/somerville-blocker.pxu
+++ /dev/null
@@ -1,76 +0,0 @@
-# Version: 1.0.1 2018-09-12
-id: somerville-blocker
-_name: Somerville Blockers
-unit: test plan
-_description: Somerville Blockers
-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::audio-cert-blockers
- com.canonical.certification::bluetooth-cert-blockers
- com.canonical.certification::camera-cert-blockers
- com.canonical.certification::esata-cert-blockers
- com.canonical.certification::firewire-cert-blockers
- com.canonical.certification::thunderbolt-cert-blockers
- com.canonical.certification::monitor-integrated-gpu-cert-blockers
- com.canonical.certification::graphics-integrated-gpu-cert-blockers
- com.canonical.certification::graphics-discrete-gpu-cert-blockers
- com.canonical.certification::monitor-discrete-gpu-cert-blockers
- com.canonical.certification::input-cert-blockers
- com.canonical.certification::keys-cert-blockers
- com.canonical.certification::mediacard-cert-blockers
- com.canonical.certification::networking-cert-blockers
- com.canonical.certification::optical-cert-blockers
- com.canonical.certification::power-management-precheck-cert-blockers
- com.canonical.certification::touchpad-cert-blockers
- com.canonical.certification::touchscreen-cert-blockers
- com.canonical.certification::usb-cert-blockers
- com.canonical.certification::usb3-cert-blockers
- com.canonical.certification::usb-c-cert-blockers
- com.canonical.certification::wireless-cert-blockers
- com.canonical.certification::before-suspend-reference-cert-blockers
- # 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-blockers
- com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-blockers
- com.canonical.certification::suspend-key-led-oops-check-cert-blockers
- com.canonical.certification::after-suspend-reference-cert-blockers
- com.canonical.certification::after-suspend-audio-cert-blockers
- com.canonical.certification::after-suspend-camera-cert-blockers
- com.canonical.certification::after-suspend-input-cert-blockers
- com.canonical.certification::after-suspend-mediacard-cert-blockers
- com.canonical.certification::after-suspend-touchpad-cert-blockers
- com.canonical.certification::after-suspend-usb-cert-blockers
- com.canonical.certification::after-suspend-usb3-cert-blockers
- com.canonical.certification::after-suspend-usb-c-cert-blockers
- com.canonical.certification::after-suspend-wireless-cert-blockers
- com.canonical.certification::after-suspend-keys-cert-blockers
- # 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-blockers
- # 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::misc-client-cert-blockers
- com.canonical.certification::cpu-cert-blockers
- com.canonical.certification::disk-cert-blockers
- com.canonical.certification::stress-cert-blockers
- com.canonical.certification::info-attachment-cert-full
-mandatory_include:
- com.canonical.certification::miscellanea/tester-info
-exclude:
- com.canonical.certification::stress/cpu_stress_ng_test
diff --git a/units/somerville-fv-regression.pxu b/units/somerville-fv-regression.pxu
index ac30958..d76a33a 100644
--- a/units/somerville-fv-regression.pxu
+++ b/units/somerville-fv-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.5 2019-06-13
+# Version: 1.0.6 2019-09-04
 id: somerville-fv-regression
 _name: Somerville FV Regression
 unit: test plan
@@ -16,70 +16,14 @@ include:
 somerville/dell-repository
 somerville/platform-meta-test-bios-id
 somerville/desktop-kpi-dashboard
+ com.canonical.certification::audio/channels
+ com.canonical.certification::audio/external-lineout
 nested_part:
- com.canonical.certification::submission-cert-full
- com.canonical.certification::audio-cert-blockers
 oobe
- com.canonical.certification::bluetooth-cert-blockers
- com.canonical.certification::camera-cert-blockers
- com.canonical.certification::esata-cert-blockers
- com.canonical.certification::firewire-cert-blockers
- com.canonical.certification::thunderbolt-cert-blockers
- com.canonical.certification::monitor-integrated-gpu-cert-blockers
- com.canonical.certification::graphics-integrated-gpu-cert-blockers
- com.canonical.certification::graphics-discrete-gpu-cert-blockers
- com.canonical.certification::monitor-discrete-gpu-cert-blockers
- com.canonical.certification::input-cert-blockers
- com.canonical.certification::keys-cert-blockers
- com.canonical.certification::mediacard-cert-blockers
- com.canonical.certification::networking-cert-blockers
- com.canonical.certification::optical-cert-blockers
- com.canonical.certification::power-management-precheck-cert-blockers
- com.canonical.certification::touchpad-cert-blockers
- com.canonical.certification::touchscreen-cert-blockers
- com.canonical.certification::usb-cert-blockers
- com.canonical.certification::usb3-cert-blockers
- com.canonical.certification::usb-c-cert-blockers
- com.canonical.certification::wireless-cert-blockers
- com.canonical.certification::before-suspend-reference-cert-blockers
- # 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-blockers
- # com.canonical.certification::after-suspend-manual-monitor-discrete-gpu-cert-blockers
- com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-blockers
- # com.canonical.certification::after-suspend-manual-monitor-integrated-gpu-cert-blockers
- com.canonical.certification::suspend-key-led-oops-check-cert-blockers
- com.canonical.certification::after-suspend-reference-cert-blockers
- com.canonical.certification::after-suspend-audio-cert-blockers
- com.canonical.certification::after-suspend-camera-cert-blockers
- com.canonical.certification::after-suspend-input-cert-blockers
- com.canonical.certification::after-suspend-mediacard-cert-blockers
- com.canonical.certification::after-suspend-touchpad-cert-blockers
- com.canonical.certification::after-suspend-usb-cert-blockers
- com.canonical.certification::after-suspend-usb3-cert-blockers
- com.canonical.certification::after-suspend-usb-c-cert-blockers
- com.canonical.certification::after-suspend-wireless-cert-blockers
- com.canonical.certification::after-suspend-keys-cert-blockers
+ oem-generic-blocker
 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-blockers
- # 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-blockers
- com.canonical.certification::cpu-cert-blockers
- com.canonical.certification::disk-cert-blockers
- com.canonical.certification::info-attachment-cert-full
 mandatory_include:
 com.canonical.certification::miscellanea/tester-info
- com.canonical.certification::audio/channels
- com.canonical.certification::audio/external-lineout
 exclude:
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
diff --git a/units/somerville-iev-full.pxu b/units/somerville-iev-full.pxu
index 7d18e3f..68b1ed5 100644
--- a/units/somerville-iev-full.pxu
+++ b/units/somerville-iev-full.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.3 2019-06-13
+# Version: 1.0.4 2019-09-04
 id: somerville-iev-full
 _name: Somerville IEV Full
 unit: test plan
@@ -17,68 +17,7 @@ include:
 somerville/platform-meta-test-bios-id
 somerville/desktop-kpi-dashboard
 nested_part:
- com.canonical.certification::submission-cert-full
- com.canonical.certification::audio-cert-full
- com.canonical.certification::bluetooth-cert-full
- com.canonical.certification::camera-cert-full
- com.canonical.certification::esata-cert-full
- com.canonical.certification::firewire-cert-full
- com.canonical.certification::thunderbolt-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::input-cert-full
- com.canonical.certification::disk-cert-manual
- com.canonical.certification::keys-cert-full
- com.canonical.certification::led-cert-full
- com.canonical.certification::mediacard-cert-full
- com.canonical.certification::mobilebroadband-cert-full
- com.canonical.certification::networking-cert-full
- com.canonical.certification::optical-cert-full
- com.canonical.certification::power-management-precheck-cert
- com.canonical.certification::touchpad-cert-full
- com.canonical.certification::touchscreen-cert-full
- com.canonical.certification::usb-cert-full
- com.canonical.certification::usb3-cert-full
- com.canonical.certification::usb-c-cert-full
- com.canonical.certification::wireless-cert-full
- 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-audio-cert-full
- com.canonical.certification::after-suspend-camera-cert-full
- com.canonical.certification::after-suspend-input-cert-full
- com.canonical.certification::after-suspend-led-cert-full
- com.canonical.certification::after-suspend-mediacard-cert-full
- com.canonical.certification::after-suspend-touchpad-cert-full
- com.canonical.certification::after-suspend-usb-cert-full
- com.canonical.certification::after-suspend-usb3-cert-full
- com.canonical.certification::after-suspend-usb-c-cert-full
- com.canonical.certification::after-suspend-wireless-cert-full
- com.canonical.certification::after-suspend-keys-cert-full
+ oem-generic-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
- # 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::misc-client-cert-full
- com.canonical.certification::cpu-cert-full
- com.canonical.certification::disk-cert-automated
- com.canonical.certification::tpm2.0_3.0.4
- com.canonical.certification::info-attachment-cert-full
 mandatory_include:
 com.canonical.certification::miscellanea/tester-info
diff --git a/units/somerville-iev-regression.pxu b/units/somerville-iev-regression.pxu
index b916672..ff43f32 100644
--- a/units/somerville-iev-regression.pxu
+++ b/units/somerville-iev-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.3 2019-06-13
+# Version: 1.0.4 2019-09-04
 id: somerville-iev-regression
 _name: Somerville IEV Regression
 unit: test plan
@@ -16,65 +16,10 @@ include:
 somerville/dell-repository
 somerville/platform-meta-test-bios-id
 somerville/desktop-kpi-dashboard
+ com.canonical.certification::audio/external-lineout
 nested_part:
- com.canonical.certification::submission-cert-full
- com.canonical.certification::audio-cert-blockers
- com.canonical.certification::bluetooth-cert-blockers
- com.canonical.certification::camera-cert-blockers
- com.canonical.certification::esata-cert-blockers
- com.canonical.certification::firewire-cert-blockers
- com.canonical.certification::thunderbolt-cert-blockers
- com.canonical.certification::monitor-integrated-gpu-cert-blockers
- com.canonical.certification::graphics-integrated-gpu-cert-blockers
- com.canonical.certification::graphics-discrete-gpu-cert-blockers
- com.canonical.certification::monitor-discrete-gpu-cert-blockers
- com.canonical.certification::input-cert-blockers
- com.canonical.certification::keys-cert-blockers
- com.canonical.certification::mediacard-cert-blockers
- com.canonical.certification::networking-cert-blockers
- com.canonical.certification::optical-cert-blockers
- com.canonical.certification::power-management-precheck-cert-blockers
- com.canonical.certification::touchpad-cert-blockers
- com.canonical.certification::touchscreen-cert-blockers
- com.canonical.certification::usb-cert-blockers
- com.canonical.certification::usb3-cert-blockers
- com.canonical.certification::usb-c-cert-blockers
- com.canonical.certification::wireless-cert-blockers
- com.canonical.certification::before-suspend-reference-cert-blockers
- # 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-blockers
- # com.canonical.certification::after-suspend-manual-monitor-discrete-gpu-cert-blockers
- com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-blockers
- # com.canonical.certification::after-suspend-manual-monitor-integrated-gpu-cert-blockers
- com.canonical.certification::suspend-key-led-oops-check-cert-blockers
- com.canonical.certification::after-suspend-reference-cert-blockers
- com.canonical.certification::after-suspend-audio-cert-blockers
- com.canonical.certification::after-suspend-camera-cert-blockers
- com.canonical.certification::after-suspend-input-cert-blockers
- com.canonical.certification::after-suspend-mediacard-cert-blockers
- com.canonical.certification::after-suspend-touchpad-cert-blockers
- com.canonical.certification::after-suspend-usb-cert-blockers
- com.canonical.certification::after-suspend-usb3-cert-blockers
- com.canonical.certification::after-suspend-usb-c-cert-blockers
- com.canonical.certification::after-suspend-wireless-cert-blockers
- com.canonical.certification::after-suspend-keys-cert-blockers
+ oem-generic-blocker
 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-blockers
- # 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-blockers
- com.canonical.certification::cpu-cert-blockers
- com.canonical.certification::disk-cert-blockers
- com.canonical.certification::info-attachment-cert-full
 mandatory_include:
 com.canonical.certification::miscellanea/tester-info
- com.canonical.certification::audio/external-lineout
+
diff --git a/units/somerville-regression.pxu b/units/somerville-regression.pxu
deleted file mode 100644
index cc4bf51..0000000
--- a/units/somerville-regression.pxu
+++ /dev/null
@@ -1,15 +0,0 @@
-id: somerville-regression
-_name: Somerville Regression
-unit: test plan
-_description: Somerville Regression
-include:
- 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
-nested_part:
- oem-generic-regression