Merge #399259 from ~stanley31/oem-qa-checkbox:re_locate_meta_test

Modified OEM platform meta test cases for somerville, stella and sutton 

20 files changed, 29 insertions, 46 deletions

diff --git a/units/somerville-addon.pxu b/units/somerville-addon.pxu
index 97f630a..eece58a 100644
--- a/units/somerville-addon.pxu
+++ b/units/somerville-addon.pxu
@@ -9,9 +9,7 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
- somerville/platform-meta-test
 somerville/desktop-kpi-dashboard
 nested_part:
 oem-generic-addoncard
diff --git a/units/somerville-audio.pxu b/units/somerville-audio.pxu
index 341238b..baa01f5 100644
--- a/units/somerville-audio.pxu
+++ b/units/somerville-audio.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.1 2020-07-24
+# Version: 1.1.2 2021-03-06
 id: somerville-audio
 _name: Somerville Audio
 unit: test plan
@@ -9,11 +9,9 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 nested_part:
- somerville-oem-meta
 oem-generic-audio
 power-management-s
 com.canonical.certification::power-management-reboot-poweroff-cert
diff --git a/units/somerville-auto.pxu b/units/somerville-auto.pxu
index 7adc715..a6e63c0 100644
--- a/units/somerville-auto.pxu
+++ b/units/somerville-auto.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.1 2020-03-11
+# Version: 1.1.2 2021-03-06
 id: somerville-auto
 _name: Somerville Auto
 unit: test plan
@@ -9,7 +9,6 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 nested_part:
diff --git a/units/somerville-bios-regression.pxu b/units/somerville-bios-regression.pxu
index 224ce0f..dee2400 100644
--- a/units/somerville-bios-regression.pxu
+++ b/units/somerville-bios-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.5 2020-07-29
+# Version: 1.0.6 2021-03-06
 id: somerville-bios-regression
 _name: Somerville BIOS Regression
 unit: test plan
@@ -9,12 +9,10 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 misc/generic/grub_boothole
 nested_part:
- somerville-oem-meta
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-full
 oobe
diff --git a/units/somerville-cpu.pxu b/units/somerville-cpu.pxu
index 524468c..6e8fd3c 100644
--- a/units/somerville-cpu.pxu
+++ b/units/somerville-cpu.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.1 2018-09-12
+# Version: 1.0.2 2021-03-06
 id: somerville-cpu
 _name: Somerville CPU
 unit: test plan
@@ -8,9 +8,7 @@ include:
 com.canonical.certification::info/detect_dell_recovery
 somerville/recovery/desktop-disk
 somerville/phase-sku
- somerville/dell-repository
 somerville/installation
- somerville/platform-meta-test
 somerville/desktop-kpi-dashboard
 nested_part:
 somerville-oem-meta
diff --git a/units/somerville-dock.pxu b/units/somerville-dock.pxu
index 87c811d..b27f86c 100644
--- a/units/somerville-dock.pxu
+++ b/units/somerville-dock.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.0 2020-03-09
+# Version: 1.1.1 2021-03-06
 id: somerville-dock
 _name: Somerville Docking Tests
 unit: test plan
@@ -9,10 +9,8 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 nested_part:
- somerville-oem-meta
 oem-generic-docking
 mandatory_include:
diff --git a/units/somerville-fv-regression.pxu b/units/somerville-fv-regression.pxu
index 6bcb79a..0926473 100644
--- a/units/somerville-fv-regression.pxu
+++ b/units/somerville-fv-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.2.0 2021-06-09
+# Version: 1.2.0 2021-07-02
 id: somerville-fv-regression
 _name: Somerville FV Regression
 unit: test plan
@@ -9,13 +9,12 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 misc/generic/grub_boothole
 nested_part:
- somerville-oem-meta
 oobe
+ somerville-oem-meta-version
 oem-generic-blocker
 power-management-s
 mandatory_include:
diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index 050bd6c..29f046b 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.1 2020-07-24
+# Version: 1.1.2 2021-03-06
 id: somerville-graphic
 _name: Somerville Graphic
 unit: test plan
@@ -9,11 +9,9 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 nested_part:
- somerville-oem-meta
 oem-generic-graphic
 power-management-s
 com.canonical.certification::power-management-reboot-poweroff-cert
diff --git a/units/somerville-iev-full-20-04.pxu b/units/somerville-iev-full-20-04.pxu
index 77e75b4..a632e38 100644
--- a/units/somerville-iev-full-20-04.pxu
+++ b/units/somerville-iev-full-20-04.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.0 2020-04-22
+# Version: 1.0.1 2021-07-02
 id: somerville-iev-full-20-04
 _name: Somerville IEV Full 20.04
 unit: test plan
@@ -9,13 +9,12 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 misc/generic/grub_boothole
 nested_part:
- somerville-oem-meta
 oem-generic-full-20-04
+ somerville-oem-meta-version
 power-management-s
 mandatory_include:
 
diff --git a/units/somerville-iev-regression.pxu b/units/somerville-iev-regression.pxu
index abecbbb..f4fa55e 100644
--- a/units/somerville-iev-regression.pxu
+++ b/units/somerville-iev-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.0 2019-09-06
+# Version: 1.1.1 2021-07-02
 id: somerville-iev-regression
 _name: Somerville IEV Regression
 unit: test plan
@@ -9,13 +9,12 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
 com.canonical.certification::audio/external-lineout
 nested_part:
- somerville-oem-meta
 oem-generic-blocker
+ somerville-oem-meta-version
 power-management-s
 mandatory_include:
 
diff --git a/units/somerville-stress.pxu b/units/somerville-stress.pxu
index 75365fb..5d2e228 100644
--- a/units/somerville-stress.pxu
+++ b/units/somerville-stress.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.0 2019-09-06
+# Version: 1.1.1 2021-07-02
 id: somerville-stress
 _name: Somerville Stress
 unit: test plan
@@ -9,7 +9,6 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/desktop-kpi-dashboard
 nested_part:
 somerville-oem-meta
diff --git a/units/somerville-touch-webcam.pxu b/units/somerville-touch-webcam.pxu
index c991a2c..3df842e 100644
--- a/units/somerville-touch-webcam.pxu
+++ b/units/somerville-touch-webcam.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.1 2020-07-24
+# Version: 1.1.2 2021-03-06
 id: somerville-touch-webcam
 _name: Somerville Touch Webcam
 unit: test plan
@@ -9,10 +9,8 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/desktop-kpi-dashboard
 nested_part:
- somerville-oem-meta
- oem-generic-touch-webcam 
+ oem-generic-touch-webcam
 power-management-s
 com.canonical.certification::power-management-reboot-poweroff-cert
diff --git a/units/somerville-wireless.pxu b/units/somerville-wireless.pxu
index 22fef07..f4dce04 100644
--- a/units/somerville-wireless.pxu
+++ b/units/somerville-wireless.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.1 2020-07-24
+# Version: 1.1.2 2021-03-06
 id: somerville-wireless
 _name: Somerville Wireless
 unit: test plan
@@ -9,10 +9,8 @@ include:
 somerville/recovery/desktop-disk
 somerville/phase-sku
 somerville/phase-platform
- somerville/dell-repository
 somerville/desktop-kpi-dashboard
 nested_part:
- somerville-oem-meta
 oem-generic-wireless
 power-management-s
 com.canonical.certification::power-management-reboot-poweroff-cert
diff --git a/units/stella-full-20-04.pxu b/units/stella-full-20-04.pxu
index 8f6b7e1..c4cd9ea 100644
--- a/units/stella-full-20-04.pxu
+++ b/units/stella-full-20-04.pxu
@@ -1,14 +1,14 @@
-# Version: 1.0.1 2020-07-26
+# Version: 1.0.2 2021-07-02
 id: stella-full-20-04
 _name: Stella Full Test 20.04
 unit: test plan
 _description: Stella Full 20.04
-include: 
+include:
 stella/hp-documents
 stella/hp-wallpaper
 stella/desktop-kpi-dashboard
 misc/generic/grub_boothole
 nested_part:
- stella-oem-meta
+ stella-oem-meta-version
 oem-generic-full-20-04
 power-management-stella
diff --git a/units/stella-regression.pxu b/units/stella-regression.pxu
index 165de82..fceca16 100644
--- a/units/stella-regression.pxu
+++ b/units/stella-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.2 2020-07-26
+# Version: 1.1.3 2021-07-02
 id: stella-regression
 _name: Stella Regression Test
 unit: test plan
@@ -9,6 +9,6 @@ include:
 stella/desktop-kpi-dashboard
 misc/generic/grub_boothole
 nested_part:
- stella-oem-meta
+ stella-oem-meta-version
 oem-generic-blocker
 power-management-stella
diff --git a/units/stella-stress.pxu b/units/stella-stress.pxu
index e5036be..d7e7ab9 100644
--- a/units/stella-stress.pxu
+++ b/units/stella-stress.pxu
@@ -1,9 +1,10 @@
-# Version: 1.0.1 2019-08-25
+# Version: 1.0.2 2021-07-02
 id: stella-stress
 _name: Stella Stress
 unit: test plan
 _description: Stella Stress
 include:
 nested_part:
+ stella-oem-meta
 oem-generic-stress
 mandatory_include: \ No newline at end of file
diff --git a/units/sutton-full-20-04.pxu b/units/sutton-full-20-04.pxu
index 6fda4dd..0c38767 100644
--- a/units/sutton-full-20-04.pxu
+++ b/units/sutton-full-20-04.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.1 2020-07-28
+# Version: 1.0.2 2021-07-02
 id: sutton-full-20-04
 _name: Sutton Full Test 20.04
 unit: test plan
@@ -12,7 +12,7 @@ include:
 com.canonical.ce::sutton/fingerprint-positive
 misc/generic/grub_boothole
 nested_part:
+ sutton-oem-meta-version
 oem-generic-full-20-04
- sutton-oem-meta
 mandatory_include:
 exclude:
diff --git a/units/sutton-full.pxu b/units/sutton-full.pxu
index 3fcfae9..9f4963a 100644
--- a/units/sutton-full.pxu
+++ b/units/sutton-full.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.0 2019-09-04
+# Version: 1.0.1 2021-07-02
 id: sutton-full
 _name: Sutton Full Tests
 unit: test plan
@@ -12,6 +12,7 @@ include:
 com.canonical.ce::sutton/desktop-kpi-dashboard
 misc/generic/grub_boothole
 nested_part:
+ sutton-oem-meta-version
 oem-generic-full
 mandatory_include:
 exclude:
diff --git a/units/sutton-regression.pxu b/units/sutton-regression.pxu
index 6b60e6b..db310bf 100644
--- a/units/sutton-regression.pxu
+++ b/units/sutton-regression.pxu
@@ -10,4 +10,5 @@ include:
 com.canonical.ce::sutton/sourceslist/subproject-bionic
 misc/generic/grub_boothole
 nested_part:
+ sutton-oem-meta-version
 oem-generic-blocker
diff --git a/units/sutton-stress.pxu b/units/sutton-stress.pxu
index 0a39b90..959f54f 100644
--- a/units/sutton-stress.pxu
+++ b/units/sutton-stress.pxu
@@ -4,4 +4,5 @@ unit: test plan
 _description: Sutton Stress
 include:
 nested_part:
+ sutton-oem-meta
 oem-generic-stress