add auto and audio test plan and remove automated/sru test plan

4 files changed, 54 insertions, 107 deletions

diff --git a/units/somerville-audio.pxu b/units/somerville-audio.pxu
new file mode 100755
index 0000000..efeebd3
--- /dev/null
+++ b/units/somerville-audio.pxu
@@ -0,0 +1,34 @@
+# 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
+ 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
+ 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.
+nested_part:
+ oem-generic-audio
+ 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
diff --git a/units/somerville-auto.pxu b/units/somerville-auto.pxu
new file mode 100755
index 0000000..de59e47
--- /dev/null
+++ b/units/somerville-auto.pxu
@@ -0,0 +1,20 @@
+# 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
+ 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:
+ 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-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