Pulled the latest change to make sure there is no code conflict

Merge branch 'master' of git+ssh://git.launchpad.net/oem-qa-checkbox into oem-generic-wireless 

15 files changed, 71 insertions, 519 deletions

diff --git a/units/somerville-audio.pxu b/units/somerville-audio.pxu
new file mode 100755
index 0000000..ee24b51
--- /dev/null
+++ b/units/somerville-audio.pxu
@@ -0,0 +1,23 @@
+# Version: 1.1 2019-09-03
+id: somerville-audio
+_name: Somerville Audio
+unit: test plan
+_description: Somerville Audio
+include:
+ com.canonical.certification::dell_bto_xml_attachment
+ com.canonical.certification::info/detect_dell_recovery
+ somerville/dkms-build-exclusive-test
+ somerville/recovery/desktop-disk
+ somerville/phase-sku
+ somerville/phase-platform
+ somerville/dell-repository
+ somerville/platform-meta-test-bios-id
+ somerville/desktop-kpi-dashboard
+nested_part:
+ oem-generic-audio
+ power-management-s
+ com.canonical.certification::power-management-reboot-poweroff-cert
+ 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
+
diff --git a/units/somerville-auto.pxu b/units/somerville-auto.pxu
new file mode 100755
index 0000000..2312e1e
--- /dev/null
+++ b/units/somerville-auto.pxu
@@ -0,0 +1,17 @@
+# Version: 1.1. 2019-09-03
+id: somerville-auto
+_name: Somerville Auto
+unit: test plan
+_description: Somerville Auto
+include:
+ com.canonical.certification::dell_bto_xml_attachment
+ com.canonical.certification::info/detect_dell_recovery
+ somerville/dkms-build-exclusive-test
+ somerville/recovery/desktop-disk
+ somerville/phase-sku
+ somerville/phase-platform
+ somerville/dell-repository
+ somerville/platform-meta-test-bios-id
+ somerville/desktop-kpi-dashboard
+nested_part:
+ oem-generic-auto
diff --git a/units/somerville-automated.pxu b/units/somerville-automated.pxu
deleted file mode 100644
index 33ef963..0000000
--- a/units/somerville-automated.pxu
+++ /dev/null
@@ -1,31 +0,0 @@
-id: somerville-automated
-_name: Somerville automated
-unit: test plan
-_description: Somerville automated tests only
-include:
- com.canonical.certification::dell_bto_xml_attachment
- com.canonical.certification::info/detect_dell_recovery
- com.canonical.certification::recovery_info_attachment
- 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::audio-cert-automated
- com.canonical.certification::bluetooth-cert-automated
- com.canonical.certification::camera-cert-automated
- com.canonical.certification::mobilebroadband-cert-automated
- com.canonical.certification::networking-cert-automated
- com.canonical.certification::power-management-precheck-cert-automated
- com.canonical.certification::wireless-cert-automated
- com.canonical.certification::before-suspend-reference-cert-automated
- com.canonical.certification::power-management-reboot-poweroff-cert-automated
- com.canonical.certification::misc-client-cert-automated
- com.canonical.certification::cpu-cert-automated
- com.canonical.certification::disk-cert-automated
- com.canonical.certification::tpm2.0_3.0.4
- com.canonical.certification::info-attachment-cert-full
-mandatory_include:
- # Meta-job to include required resources, don't remove.
- com.canonical.certification::miscellanea/submission-resources
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..55bf75d 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.1.0 2019-09-06
 id: somerville-fv-regression
 _name: Somerville FV Regression
 unit: test plan
@@ -6,80 +6,20 @@ _description: Somerville FV Regression
 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
+ 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-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-iev-full.pxu b/units/somerville-iev-full.pxu
index 7d18e3f..ba7e91e 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.1.0 2019-09-06
 id: somerville-iev-full
 _name: Somerville IEV Full
 unit: test plan
@@ -6,79 +6,15 @@ _description: Somerville IEV Full
 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-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..cd0f31e 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.1.0 2019-09-06
 id: somerville-iev-regression
 _name: Somerville IEV Regression
 unit: test plan
@@ -6,75 +6,16 @@ _description: Somerville IEV Regression
 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
+ 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
diff --git a/units/somerville-sru.pxu b/units/somerville-sru.pxu
deleted file mode 100644
index 11c6824..0000000
--- a/units/somerville-sru.pxu
+++ /dev/null
@@ -1,76 +0,0 @@
-# Version: 1.0.1 2018-09-12
-id: somerville-sru
-_name: Somerville SRU
-unit: test plan
-_description: Somerville SRU
-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
- com.canonical.certification::miscellanea/tester-info
- com.canonical.certification::miscellanea/submission-resources
- com.canonical.certification::info-attachment-cert-full
- com.canonical.certification::audio/alsa_record_playback_automated
- com.canonical.certification::bluetooth/detect-output
- com.canonical.certification::camera/detect
- com.canonical.certification::camera/multiple-resolution-images
- com.canonical.certification::cpu/scaling_test
- com.canonical.certification::cpu/scaling_test-log-attach
- com.canonical.certification::cpu/offlining_test
- com.canonical.certification::cpu/topology
- com.canonical.certification::disk/read_performance_.*
- com.canonical.certification::graphics/xorg-version
- com.canonical.certification::graphics/1_compiz_check_.*
- com.canonical.certification::graphics/xorg-failsafe
- com.canonical.certification::graphics/xorg-process
- com.canonical.certification::install/apt-get-gets-updates
- com.canonical.certification::mediacard/sd-preinserted
- com.canonical.certification::memory/info
- com.canonical.certification::ethernet/detect
- com.canonical.certification::ethernet/info_automated
- com.canonical.certification::miscellanea/dkms_build_validation
- com.canonical.certification::networking/http
- com.canonical.certification::networking/gateway_ping
- com.canonical.certification::power-management/tickless_idle
- com.canonical.certification::power-management/rtc
- com.canonical.certification::power-management/fwts_wakealarm
- com.canonical.certification::power-management/fwts_wakealarm-log-attach
- com.canonical.certification::usb/detect
- com.canonical.certification::usb/storage-preinserted
- com.canonical.certification::wireless/wireless_scanning_.*
- com.canonical.certification::wireless/wireless_connection_wpa_bg_nm_.*
- com.canonical.certification::wireless/wireless_connection_open_bg_nm_.*
- com.canonical.certification::wireless/wireless_connection_wpa_n_nm_.*
- com.canonical.certification::wireless/wireless_connection_open_n_nm_.*
- com.canonical.certification::suspend/audio_before_suspend
- com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend
- com.canonical.certification::suspend/cpu_before_suspend
- com.canonical.certification::suspend/network_before_suspend
- com.canonical.certification::suspend/memory_before_suspend
- com.canonical.certification::suspend/suspend_advanced_auto
- com.canonical.certification::suspend/suspend-single-log-attach
- com.canonical.certification::suspend/audio_after_suspend_auto
- com.canonical.certification::suspend/network_resume_time_auto
- com.canonical.certification::suspend/wifi_resume_time_auto
- com.canonical.certification::suspend/usb_storage_preinserted_after_suspend
- com.canonical.certification::suspend/record_playback_after_suspend_auto
- com.canonical.certification::suspend/bluetooth_obex_browse_after_suspend_auto
- com.canonical.certification::suspend/cpu_after_suspend_auto
- com.canonical.certification::suspend/memory_after_suspend_auto
- com.canonical.certification::after-suspend-wireless/wireless_connection_wpa_bg_nm_.*
- com.canonical.certification::after-suspend-wireless/wireless_connection_open_bg_nm_.*
- com.canonical.certification::after-suspend-wireless/wireless_connection_wpa_n_nm_.*
- com.canonical.certification::after-suspend-wireless/wireless_connection_open_n_nm_.*
- com.canonical.certification::suspend/gpu_lockup_after_suspend
-bootstrap_include:
- com.canonical.certification::device
- com.canonical.certification::graphics_card
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
diff --git a/units/stella-stress.pxu b/units/stella-stress.pxu
index d06c5d7..e5036be 100644
--- a/units/stella-stress.pxu
+++ b/units/stella-stress.pxu
@@ -3,6 +3,7 @@ id: stella-stress
 _name: Stella Stress
 unit: test plan
 _description: Stella Stress
+include:
 nested_part:
 oem-generic-stress
 mandatory_include: \ No newline at end of file
diff --git a/units/sutton-stress.pxu b/units/sutton-stress.pxu
index a627b85..0a39b90 100644
--- a/units/sutton-stress.pxu
+++ b/units/sutton-stress.pxu
@@ -3,13 +3,5 @@ _name: Sutton Stress
 unit: test plan
 _description: Sutton Stress
 include:
- com.canonical.certification::recovery_info_attachment
- 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
-mandatory_include:
- com.canonical.certification::miscellanea/tester-info
+ oem-generic-stress
diff --git a/units/sutton-touch-webcam.pxu b/units/sutton-touch-webcam.pxu
new file mode 100644
index 0000000..47535cd
--- /dev/null
+++ b/units/sutton-touch-webcam.pxu
@@ -0,0 +1,8 @@
+id: sutton-touch-webcam
+_name: Sutton Generic Touch Webcam
+unit: test plan
+_description: The generic touchpad, touchscreen and
+ webcam test plan for Sutton projects.
+include:
+nested_part:
+ oem-generic-touch-webcam
diff --git a/units/sutton-wireless.pxu b/units/sutton-wireless.pxu
index 49f2cb1..59bc726 100644
--- a/units/sutton-wireless.pxu
+++ b/units/sutton-wireless.pxu
@@ -4,46 +4,4 @@ _description: Sutton Wireless
 unit: test plan
 include:
 nested_part:
- com.canonical.certification::submission-cert-full
- com.canonical.certification::bluetooth-cert-full
- com.canonical.certification::mobilebroadband-cert-full
- com.canonical.certification::keys-cert-full
- com.canonical.certification::networking-cert-full
- com.canonical.certification::power-management-precheck-cert
- com.canonical.certification::wireless-cert-full
- com.canonical.certification::before-suspend-reference-cert-full
- com.canonical.certification::suspend-key-led-oops-check-cert
- com.canonical.certification::after-suspend-reference-cert-full
- com.canonical.certification::after-suspend-wireless-cert-full
- com.canonical.certification::after-suspend-keys-cert-full
- com.canonical.certification::power-management-reboot-poweroff-cert
- 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/brightness
- com.canonical.certification::keys/media-control
- com.canonical.certification::keys/mute
- com.canonical.certification::keys/volume
- com.canonical.certification::keys/video-out
- 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/brightness
- 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/video-out
- 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
+ oem-generic-wireless