Merge #371771 from ~ray.chen/oem-qa-checkbox/+git/oem-plainbox:nested-oem-generic-to-stella

3 files changed, 16 insertions, 66 deletions

diff --git a/units/stella-stress.pxu b/units/stella-stress.pxu
index ae982b5..d06c5d7 100644
--- a/units/stella-stress.pxu
+++ b/units/stella-stress.pxu
@@ -1,17 +1,8 @@
-# Version: 1.0.0 2019-06-14
+# Version: 1.0.1 2019-08-25
 id: stella-stress
 _name: Stella Stress
 unit: test plan
 _description: Stella 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
- com.canonical.ce::misc/generic/stress/journald-persistent-auto
+ oem-generic-stress
+mandatory_include: \ No newline at end of file
diff --git a/units/stella-touch-webcam.pxu b/units/stella-touch-webcam.pxu
new file mode 100644
index 0000000..dceff77
--- /dev/null
+++ b/units/stella-touch-webcam.pxu
@@ -0,0 +1,10 @@
+# Version: 1.0.0 2019-08-25
+id: stella-touch-webcam
+_name: Stella Touch and Webcam
+unit: test plan
+_description: Stella Touch and Webcam
+include:
+nested_part:
+ oem-generic-touch-webcam
+mandatory_include:
+exclude: \ No newline at end of file
diff --git a/units/stella-wireless.pxu b/units/stella-wireless.pxu
index 6df24c8..faf26c6 100644
--- a/units/stella-wireless.pxu
+++ b/units/stella-wireless.pxu
@@ -1,61 +1,10 @@
-# Version: 1.0.0 2019-06-14
+# Version: 1.0.1 2019-08-25
 id: stella-wireless
 _name: Stella Wireless
 unit: test plan
 _description: Stella Wireless
 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
- # 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.
- # Now we ask to switch to the integrated graphics card. This requires a
- # restart of checkbox.
- 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
- 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::info-attachment-cert-full
+ oem-generic-wireless
 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
+exclude: \ No newline at end of file