Remove somerville-oem-meta test plan

Remove somerville-oem-meta test plan from somerville related test plan. Modified OEM platform meta related test cases - Create test case to validate the OEM platform meta is installed - Create test case to validate the OEM platform meta version is correct. 

4 files changed, 127 insertions, 31 deletions

diff --git a/jobs/misc/misc-generic.txt b/jobs/misc/misc-generic.txt
index ba53921..e6cce6c 100644
--- a/jobs/misc/misc-generic.txt
+++ b/jobs/misc/misc-generic.txt
@@ -41,43 +41,102 @@ _description:
 For some packages which may have license or patent issues, this case checks if they are installed.
 
 plugin: shell
-id: misc/generic/check-oem-project-meta
+id: misc/generic/check-oem-project-meta-installed
+category_id: com.canonical.plainbox::miscellanea
 imports: from com.canonical.certification import lsb
 requires: lsb.release >= "20.04"
+command: check-oem-package-source.py --gen-meta-type project --no-check-content --no-check-version
+_summary: Check OEM Project mata is installed
+_description:
+ To validate the OEM project meta is installed, this case only supported in focal and later.
+
+plugin: shell
+id: misc/generic/check-oem-project-meta-version
+category_id: com.canonical.plainbox::miscellanea
+imports: from com.canonical.certification import lsb
+requires: lsb.release >= "20.04"
+depends: misc/generic/check-oem-project-meta-installed
 command: check-oem-package-source.py --gen-meta-type project --no-check-content
-_summary: Check OEM Project mata exists in manifest and OEM archive
+_summary: Check the OEM Project mata version between manifest and OEM archive
 _description:
- To validate the OEM project meta in manifest and the version same as in OEM archive.
- This test cases only supported in focal and later.
+ To validate the OEM project meta version in manifest equal to OEM archive.
+ This case only supported in focal and later.
 
 plugin: shell
-id: misc/generic/check-oem-project-factory-meta
+id: misc/generic/check-oem-project-factory-meta-installed
+category_id: com.canonical.plainbox::miscellanea
 imports: from com.canonical.certification import lsb
 requires: lsb.release >= "20.04"
-command: check-oem-package-source.py --gen-meta-type project --factory-meta --no-check-content
-_summary: Check OEM Project factory mata exists in manifest and OEM archive
+command: check-oem-package-source.py --gen-meta-type project --factory-meta --no-check-content --no-check-version
+_summary: Check OEM Project factory mata is installed
 _description:
- To validate the OEM platform meta in manifest and the version same as in OEM archive.
- This test cases only supported in focal and later.
+ To validate the OEM project factory meta is installed, this case only supported in focal and later.
 
 plugin: shell
-id: misc/generic/check-oem-platform-meta
+id: misc/generic/check-oem-project-factory-meta-version
+category_id: com.canonical.plainbox::miscellanea
 imports: from com.canonical.certification import lsb
 requires: lsb.release >= "20.04"
-command: check-oem-package-source.py
-_summary: Check OEM Platform mata exists in manifest, OEM and Ubuntu archive
+depends: misc/generic/check-oem-project-factory-meta-installed
+command: check-oem-package-source.py --gen-meta-type project --factory-meta --no-check-content
+_summary: Check OEM Project factory mata version between manifest and OEM archive
 _description:
- To validate the OEM platform meta in manifest, OEM archive and Ubuntu archive.
+ To validate the OEM project factory meta verison in manifest equal to OEM archive.
+ This case only supported in focal and later.
+
+plugin: shell
+id: misc/generic/check-oem-platform-meta-installed
+category_id: com.canonical.plainbox::miscellanea
+imports: from com.canonical.certification import lsb
+requires: lsb.release >= "20.04"
+command: check-oem-package-source.py --no-check-content --no-check-version
+_summary: Check OEM Platform mata is installed
+_description:
+ To validate the OEM platform meta is installed, this case only supported in focal and later.
+
+plugin: shell
+id: misc/generic/check-oem-platform-meta-source-list
+category_id: com.canonical.plainbox::miscellanea
+imports: from com.canonical.certification import lsb
+requires: lsb.release >= "20.04"
+command: check-oem-package-source.py --no-check-version
+_summary: Check the URL of OEM source list file is correct
+_description:
+ To validate the URL of OEM source list file is correct, this case only supported in focal and later.
+
+plugin: shell
+id: misc/generic/check-oem-platform-meta-version
+category_id: com.canonical.plainbox::miscellanea
+imports: from com.canonical.certification import lsb
+requires: lsb.release >= "20.04"
+depends: misc/generic/check-oem-platform-meta-installed
+command: check-oem-package-source.py --no-check-content
+_summary: Check OEM Platform mata version between manifest and OEM archive
+_description:
+ To validate the OEM platform meta version in manifest equal to OEM archive.
 This test cases only supported in focal and later.
 
 plugin: shell
-id: misc/generic/check-oem-platform-factory-meta
+id: misc/generic/check-oem-platform-factory-meta-installed
+category_id: com.canonical.plainbox::miscellanea
+imports: from com.canonical.certification import lsb
+requires: lsb.release >= "20.04"
+command: check-oem-package-source.py --factory-meta --no-check-content --no-check-version
+_summary: Check OEM Platform factory mata is installed
+_description:
+ To validate the OEM platform factory meta is installed, this case only supported in focal and later.
+
+plugin: shell
+id: misc/generic/check-oem-platform-factory-meta-version
+category_id: com.canonical.plainbox::miscellanea
 imports: from com.canonical.certification import lsb
 requires: lsb.release >= "20.04"
+depends: misc/generic/check-oem-platform-factory-meta-installed
 command: check-oem-package-source.py --factory-meta --no-check-content
-_summary: Check OEM Platform factory mata exists in manifest and OEM archive
+_summary: Check OEM Platform factory mata version between manifest and OEM archive
 _description:
- To validate the OEM platform factory meta in manifest and the version same as in OEM archive.
+ To validate the OEM platform factory meta version in manifest equal to OEM archive.
+ This case only supported in focal and later.
 
 id: misc/generic/stock_ubuntu_platform_meta
 user: root
diff --git a/jobs/somerville/somerville-oem-meta.pxu b/jobs/somerville/somerville-oem-meta.pxu
index 7714fc9..0cbafbd 100644
--- a/jobs/somerville/somerville-oem-meta.pxu
+++ b/jobs/somerville/somerville-oem-meta.pxu
@@ -2,12 +2,24 @@ unit: test plan
 id: somerville-oem-meta
 category_overrides: apply "somerville" to .*
 _name: Somerville OEM meta test
-_description: Somerville OEM Meta file test
+_description: Validate the Somerville OEM meta package has been installed
 include:
 somerville/platform-meta-test
- misc/generic/check-oem-project-meta
- misc/generic/check-oem-project-factory-meta
- misc/generic/check-oem-platform-meta
- misc/generic/check-oem-platform-factory-meta
+ misc/generic/check-oem-project-meta-installed
+ misc/generic/check-oem-project-factory-meta-installed
+ misc/generic/check-oem-platform-meta-installed
+ misc/generic/check-oem-platform-factory-meta-installed
 nested_part:
 
+unit: test plan
+id: somerville-oem-meta-version
+category_overrides: apply "somerville" to .*
+_name: Somerville OEM meta version test
+_description: Validate the Somerville OEM meta package version are correct
+include:
+ misc/generic/check-oem-project-meta-version
+ misc/generic/check-oem-project-factory-meta-version
+ misc/generic/check-oem-platform-meta-version
+ misc/generic/check-oem-platform-factory-meta-version
+nested_part:
+ somerville-oem-meta
diff --git a/jobs/stella/stella-oem-meta.pxu b/jobs/stella/stella-oem-meta.pxu
index 6b07b1a..4ba1e3e 100644
--- a/jobs/stella/stella-oem-meta.pxu
+++ b/jobs/stella/stella-oem-meta.pxu
@@ -2,13 +2,25 @@ unit: test plan
 id: stella-oem-meta
 category_overrides: apply "stella" to .*
 _name: Stella OEM meta test
-_description: Stella OEM meta test
+_description: Validate the Stella OEM meta package has been installed
 include:
 # Mark below test case first, but need to confirm is it needed for beaver
 # stella/sourcelist/.*-repository$
- misc/generic/check-oem-project-meta
- misc/generic/check-oem-project-factory-meta
- misc/generic/check-oem-platform-meta
- misc/generic/check-oem-platform-factory-meta
+ misc/generic/check-oem-project-meta-installed
+ misc/generic/check-oem-project-factory-meta-installed
+ misc/generic/check-oem-platform-meta-installed
+ misc/generic/check-oem-platform-factory-meta-installed
 nested_part:
 
+unit: test plan
+id: stella-oem-meta-version
+category_overrides: apply "stella" to .*
+_name: Stella OEM meta version test
+_description: Validate the Stella OEM meta package version are correct
+include:
+ misc/generic/check-oem-project-meta-version
+ misc/generic/check-oem-project-factory-meta-version
+ misc/generic/check-oem-platform-meta-version
+ misc/generic/check-oem-platform-factory-meta-version
+nested_part:
+ stella-oem-meta \ No newline at end of file
diff --git a/jobs/sutton/sutton-oem-meta.pxu b/jobs/sutton/sutton-oem-meta.pxu
index 5eb01a7..b6b9b07 100644
--- a/jobs/sutton/sutton-oem-meta.pxu
+++ b/jobs/sutton/sutton-oem-meta.pxu
@@ -2,13 +2,26 @@ unit: test plan
 id: sutton-oem-meta
 category_overrides: apply "sutton" to .*
 _name: Sutton OEM meta test
-_description: Sutton OEM meta test
+_description: Validate the Sutton OEM meta package has been installed
 include:
 com.canonical.ce::sutton/sourceslist/focal-oem
 com.canonical.ce::sutton/sourceslist/security
 com.canonical.ce::sutton/sourceslist/meta
- misc/generic/check-oem-project-meta
- misc/generic/check-oem-project-factory-meta
- misc/generic/check-oem-platform-meta
- misc/generic/check-oem-platform-factory-meta
+ misc/generic/check-oem-project-meta-installed
+ misc/generic/check-oem-project-factory-meta-installed
+ misc/generic/check-oem-platform-meta-installed
+ misc/generic/check-oem-platform-factory-meta-installed
 nested_part:
+
+unit: test plan
+id: sutton-oem-meta-version
+category_overrides: apply "sutton" to .*
+_name: Sutton OEM meta version test
+_description: Validate the Sutton OEM meta package version are correct
+include:
+ misc/generic/check-oem-project-meta-version
+ misc/generic/check-oem-project-factory-meta-version
+ misc/generic/check-oem-platform-meta-version
+ misc/generic/check-oem-platform-factory-meta-version
+nested_part:
+ sutton-oem-meta \ No newline at end of file