12 files changed, 36 insertions, 39 deletions
diff --git a/units/somerville-automated.pxu b/units/somerville-automated.pxu
index 22e364b..7d48975 100644
--- a/units/somerville-automated.pxu
+++ b/units/somerville-automated.pxu
@@ -1,7 +1,7 @@
 id: somerville-automated
 _name: Somerville automated
-_description: Somerville automated tests only
 unit: test plan
+_description: Somerville automated tests only
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -9,7 +9,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::audio-cert-automated
 com.canonical.certification::bluetooth-cert-automated
@@ -23,7 +23,7 @@ nested_part:
 com.canonical.certification::misc-client-cert-automated
 com.canonical.certification::cpu-cert-automated
 com.canonical.certification::disk-cert-automated
- com.canonical.certification::tpm2.0
+ 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.
diff --git a/units/somerville-bios-regression.pxu b/units/somerville-bios-regression.pxu
index bc962fd..9db3a30 100644
--- a/units/somerville-bios-regression.pxu
+++ b/units/somerville-bios-regression.pxu
@@ -1,8 +1,8 @@
-# Version: 1.0.3 2018-09-07
+# Version: 1.0.4 2018-09-19
 id: somerville-bios-regression
 _name: Somerville BIOS Regression
-_description: Somerville BIOS Regression
 unit: test plan
+_description: Somerville BIOS Regression
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-full
@@ -40,7 +40,7 @@ nested_part:
 com.canonical.certification::misc-client-cert-automated
 com.canonical.certification::cpu-cert-automated
 com.canonical.certification::disk-cert-automated
- com.canonical.certification::tpm2.0
+ 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.
diff --git a/units/somerville-blocker.pxu b/units/somerville-blocker.pxu
index e226111..748451d 100644
--- a/units/somerville-blocker.pxu
+++ b/units/somerville-blocker.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.0 2018-06-19
+# Version: 1.0.1 2018-09-12
 id: somerville-blocker
 _name: Somerville Blockers
 unit: test plan
@@ -7,9 +7,13 @@ 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/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-blockers
@@ -39,7 +43,6 @@ nested_part:
 # 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::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
diff --git a/units/somerville-cpu.pxu b/units/somerville-cpu.pxu
index 028ea4c..ea6cdcf 100644
--- a/units/somerville-cpu.pxu
+++ b/units/somerville-cpu.pxu
@@ -1,8 +1,8 @@
-# Version: 1.0.0 2017-11-21
+# Version: 1.0.1 2018-09-12
 id: somerville-cpu
 _name: Somerville CPU
-_description: Somerville CPU
 unit: test plan
+_description: Somerville CPU
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::monitor-integrated-gpu-cert-full
@@ -30,7 +30,6 @@ nested_part:
 # 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
diff --git a/units/somerville-fv-regression.pxu b/units/somerville-fv-regression.pxu
index 8c399d9..49251a3 100644
--- a/units/somerville-fv-regression.pxu
+++ b/units/somerville-fv-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.3 2018-08-31
+# Version: 1.0.4 2018-09-12
 id: somerville-fv-regression
 _name: Somerville FV Regression
 unit: test plan
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-blockers
@@ -44,7 +44,6 @@ nested_part:
 # 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::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
diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index d19496a..21a6751 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -1,8 +1,8 @@
-# Version: 1.0.0 2017-11-22
+# Version: 1.0.1 2018-09-12
 id: somerville-graphic
 _name: Somerville Graphic
-_description: Somerville Graphic
 unit: test plan
+_description: Somerville Graphic
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::monitor-integrated-gpu-cert-full
@@ -31,7 +31,6 @@ nested_part:
 # 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
diff --git a/units/somerville-iev-full.pxu b/units/somerville-iev-full.pxu
index 2e61bcb..a4f992e 100644
--- a/units/somerville-iev-full.pxu
+++ b/units/somerville-iev-full.pxu
@@ -1,8 +1,8 @@
-# Version: 1.0.1 2018-01-11
+# Version: 1.0.2 2018-09-19
 id: somerville-iev-full
 _name: Somerville IEV Full
-_description: Somerville IEV Full
 unit: test plan
+_description: Somerville IEV Full
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-full
@@ -48,7 +48,6 @@ nested_part:
 # 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
@@ -74,7 +73,7 @@ nested_part:
 com.canonical.certification::stress-suspend-30-cycles-with-reboots-automated
 com.canonical.certification::misc-client-cert-full
 com.canonical.certification::disk-cert-automated
- com.canonical.certification::tpm2.0
+ 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 626b030..de4c30b 100644
--- a/units/somerville-iev-regression.pxu
+++ b/units/somerville-iev-regression.pxu
@@ -1,4 +1,4 @@
-# Version: 1.0.1 2018-01-11
+# Version: 1.0.2 2018-09-12
 id: somerville-iev-regression
 _name: Somerville IEV Regression
 unit: test plan
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-blockers
@@ -43,7 +43,6 @@ nested_part:
 # 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::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
diff --git a/units/somerville-sru.pxu b/units/somerville-sru.pxu
index 9c7c85f..f7f663b 100644
--- a/units/somerville-sru.pxu
+++ b/units/somerville-sru.pxu
@@ -1,10 +1,8 @@
+# Version: 1.0.1 2018-09-12
 id: somerville-sru
 _name: Somerville SRU
 unit: test plan
-_description:
- This test plan contains tests that are useful for validating a Stable
- Release Update (SRU) on Ubuntu Certified systems. This test plan is not
- recommended for, nor will it be accepted for self-testing purposes.
+_description: Somerville SRU
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -15,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 com.canonical.certification::miscellanea/tester-info
 com.canonical.certification::miscellanea/submission-resources
 com.canonical.certification::info-attachment-cert-full
diff --git a/units/somerville-stress.pxu b/units/somerville-stress.pxu
index 53c366a..2b4bd30 100644
--- a/units/somerville-stress.pxu
+++ b/units/somerville-stress.pxu
@@ -1,3 +1,4 @@
+# Version: 1.0.0 2018-09-12
 id: somerville-stress
 _name: Somerville Stress
 unit: test plan
diff --git a/units/somerville-touch-webcam.pxu b/units/somerville-touch-webcam.pxu
index 6b7e7de..4eaeed5 100644
--- a/units/somerville-touch-webcam.pxu
+++ b/units/somerville-touch-webcam.pxu
@@ -1,8 +1,8 @@
-# Version: 1.0.0 2017-11-22
+# Version: 1.0.1 2018-09-12
 id: somerville-touch-webcam
 _name: Somerville Touch Webcam
-_description: Somerville Touch Webcam
 unit: test plan
+_description: Somerville Touch and Webcam
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::camera-cert-full
diff --git a/units/somerville-wireless.pxu b/units/somerville-wireless.pxu
index a4c7575..3bc7a53 100644
--- a/units/somerville-wireless.pxu
+++ b/units/somerville-wireless.pxu
@@ -1,8 +1,8 @@
-# Version: 1.0.0 2017-11-22
+# Version: 1.0.1 2018-09-12
 id: somerville-wireless
 _name: Somerville Wireless
-_description: Somerville Wireless
 unit: test plan
+_description: Somerville Wireless
 include:
 com.canonical.certification::dell_bto_xml_attachment
 com.canonical.certification::info/detect_dell_recovery
@@ -13,7 +13,7 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- somerville/platform-meta-test
+ somerville/platform-meta-test-bios-id
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::bluetooth-cert-full