Created launchers for 24.04 Release (New) (#1200)

Created launchers for 24.04. Removing versioned launchers going forward and will deprecate older version launchers in the future (e.g. certify-22.04 style launchers will be deprecated in favor of a single version agnostic launcher called certify-ubuntu-server SERVCERT-1538
canonical · Apr 19, 2024 · 84878c2 · 84878c2
1 parent c397ca0
commit 84878c2
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 62 deletions.
diff --git a/...rtification-server/launcher/certify-20.04 → ...ion-server/launcher/certify-ubuntu-server b/...rtification-server/launcher/certify-20.04 → ...ion-server/launcher/certify-ubuntu-server
@@ -6,7 +6,7 @@ launcher_version = 1
 stock_reports = submission_files, certification
 
 [test plan]
-unit = com.canonical.certification::20.04-server-full
+unit = com.canonical.certification::server-full
 forced = yes
 
 [test selection]

diff --git a/...ication-server/launcher/certify-soc-20.04 → ...server/launcher/certify-ubuntu-server-soc b/...ication-server/launcher/certify-soc-20.04 → ...server/launcher/certify-ubuntu-server-soc
@@ -6,7 +6,7 @@ launcher_version = 1
 stock_reports = submission_files, certification
 
 [test plan]
-unit = com.canonical.certification::20.04-server-soc-cert
+unit = com.canonical.certification::server-soc-cert
 forced = yes
 
 [test selection]

diff --git a/...ion-server/launcher/test-functional-20.04 → ...-server/launcher/certify-ubuntu-server-vm b/...ion-server/launcher/test-functional-20.04 → ...-server/launcher/certify-ubuntu-server-vm
@@ -6,7 +6,7 @@ launcher_version = 1
 stock_reports = submission_files, certification
 
 [test plan]
-unit = com.canonical.certification::20.04-server-functional
+unit = com.canonical.certification::virtual-machine-full
 forced = yes
 
 [test selection]

diff --git a/...fication-server/launcher/certify-vm-20.04 → ...ification-server/launcher/test-functional b/...fication-server/launcher/certify-vm-20.04 → ...ification-server/launcher/test-functional
@@ -6,7 +6,7 @@ launcher_version = 1
 stock_reports = submission_files, certification
 
 [test plan]
-unit = com.canonical.certification::20.04-virtual-machine-full
+unit = com.canonical.certification::server-functional
 forced = yes
 
 [test selection]

diff --git a/...cation-server/units/server-full-20.04.pxu → ...ertification-server/units/server-full.pxu b/...cation-server/units/server-full-20.04.pxu → ...ertification-server/units/server-full.pxu
@@ -1,33 +1,26 @@
-id: 20.04-server-full
-_name: 20.04 Server Certification Full
+id: server-full
+_name: Server Certification Full Test Suite
 unit: test plan
 _description:
-    This whitelist is intended to be used for server certification.
-    the tests contained here should work in any test lab envrionement.
-    Please use this whitelist for the Ubuntu Certification self-testing
-    programme.
+    This test plan contains the full Ubuntu Server Certification Test Suite.
+    The tests should work in any test lab environment however if you are not
+    using an environment set up using our tooling you may need to do some
+    additional test configuration.
 nested_part:
     com.canonical.certification::server-cpu
+    com.canonical.certification::server-disk
     com.canonical.certification::server-info-attachment-automated
     com.canonical.certification::server-firmware
     com.canonical.certification::server-miscellaneous
     com.canonical.certification::server-ethernet
+    com.canonical.certification::server-memory
+    com.canonical.certification::server-networking
     com.canonical.certification::nvdimm-full
     com.canonical.certification::server-usb
 include:
     info/hdparm_.*.txt                         certification-status=non-blocker
     benchmarks/disk/hdparm-read_.*             certification-status=blocker
     benchmarks/disk/hdparm-cache-read_.*       certification-status=blocker
-    disk/detect                                certification-status=blocker
-    disk/stats_.*                              certification-status=blocker
-    disk/read_performance_.*                   certification-status=blocker
-    disk/smart_.*                              certification-status=non-blocker
-    disk/fstrim_.*                             certification-status=non-blocker
-    disk/disk_stress_ng_.*                     certification-status=blocker
-    disk/disk_cpu_load_.*                      certification-status=non-blocker
-    networking/predictable_names               certification-status=non-blocker
-    memory/info                                certification-status=blocker
-    stress/memory_stress_ng                    certification-status=blocker
     power-management/rtc                       certification-status=blocker
     stress/cpu_stress_ng_test                  certification-status=blocker
     virtualization/verify_lxd                  certification-status=blocker

diff --git a/...-server/units/server-functional-20.04.pxu → ...cation-server/units/server-functional.pxu b/...-server/units/server-functional-20.04.pxu → ...cation-server/units/server-functional.pxu
@@ -1,32 +1,25 @@
-id: 20.04-server-functional
-_name: 20.04 Server Certification Functional
+id: server-functional
+_name: Server Certification Functional Tests Only
 unit: test plan
 _description:
-    This whitelist is intended to be used for OEM self-testing.
-    The tests contained here should work in any test lab environment.
-    This test plan runs all server certification tests except for the really
-    demanding or lengthy ones.
+    This test plan contains the functional Ubuntu Server Certification Test Suite.
+    The tests should work in any test lab environment however if you are not
+    using an environment set up using our tooling you may need to do some
+    additional test configuration.
 nested_part:
     com.canonical.certification::server-cpu
+    com.canonical.certification::server-disk
     com.canonical.certification::server-info-attachment-automated
-    com.canonical.certification::server-firmware
     com.canonical.certification::server-miscellaneous
     com.canonical.certification::server-ethernet
+    com.canonical.certification::server-memory
+    com.canonical.certification::server-networking
     com.canonical.certification::nvdimm-full
     com.canonical.certification::server-usb
 include:
     info/hdparm_.*.txt                         certification-status=non-blocker
     benchmarks/disk/hdparm-read_.*             certification-status=blocker
     benchmarks/disk/hdparm-cache-read_.*       certification-status=blocker
-    disk/detect                                certification-status=blocker
-    disk/stats_.*                              certification-status=blocker
-    disk/read_performance_.*                   certification-status=blocker
-    disk/smart_.*                              certification-status=non-blocker
-    disk/fstrim_.*                             certification-status=non-blocker
-    disk/disk_stress_ng_.*                     certification-status=blocker
-    disk/disk_cpu_load_.*                      certification-status=non-blocker
-    networking/predictable_names               certification-status=non-blocker
-    memory/info                                certification-status=blocker
     power-management/rtc                       certification-status=blocker
     virtualization/verify_lxd                  certification-status=blocker
     virtualization/verify_lxd_vm               certification-status=blocker

diff --git a/...on-server/units/server-soc-cert-20.04.pxu → ...fication-server/units/server-soc-cert.pxu b/...on-server/units/server-soc-cert-20.04.pxu → ...fication-server/units/server-soc-cert.pxu
@@ -1,31 +1,24 @@
-id: 20.04-server-soc-cert
-_name: 20.04 System On Chip Certification (For SoC Testing)
+id: server-soc-cert
+_name: System On Chip Certification (For SoC Testing)
 unit: test plan
 _description:
     This whitelist is intended to be used for testing Server SoCs.  The tests
     contained here should work in any test lab envrionement. Please use this 
     whitelist for the Ubuntu Certification self-testing programme.
 nested_part:
     com.canonical.certification::server-cpu
+    com.canonical.certification::server-disk
     com.canonical.certification::server-info-attachment-automated
     com.canonical.certification::server-firmware
     com.canonical.certification::server-miscellaneous
     com.canonical.certification::server-ethernet
+    com.canonical.certification::server-memory
+    com.canonical.certification::server-networking
     com.canonical.certification::server-usb
 include:
     info/hdparm_.*.txt                         certification-status=non-blocker
     benchmarks/disk/hdparm-read_.*             certification-status=blocker
     benchmarks/disk/hdparm-cache-read_.*       certification-status=blocker
-    disk/detect                                certification-status=blocker
-    disk/stats_.*                              certification-status=blocker
-    disk/read_performance_.*                   certification-status=blocker
-    disk/smart_.*                              certification-status=non-blocker
-    disk/fstrim_.*                             certification-status=non-blocker
-    disk/disk_stress_ng_.*                     certification-status=blocker
-    disk/disk_cpu_load_.*                      certification-status=non-blocker
-    networking/predictable_names               certification-status=non-blocker
-    memory/info                                certification-status=blocker
-    stress/memory_stress_ng                    certification-status=blocker
     power-management/rtc                       certification-status=blocker
     stress/cpu_stress_ng_test                  certification-status=blocker
     virtualization/verify_lxd                  certification-status=blocker

diff --git a/...rver/units/virtual-machine-full-20.04.pxu → ...ion-server/units/virtual-machine-full.pxu b/...rver/units/virtual-machine-full-20.04.pxu → ...ion-server/units/virtual-machine-full.pxu
@@ -1,5 +1,5 @@
-id: 20.04-virtual-machine-full
-_name: 20.04 Virtual Machine Full (For Hypervisors)
+id: virtual-machine-full
+_name: Virtual Machine Full (For Hypervisors)
 unit: test plan
 _description:
     This whitelist is intended to be used for testing Ubuntu Guests on 
@@ -8,28 +8,20 @@ _description:
     self-testing programme.
 nested_part:
     com.canonical.certification::server-cpu
+    com.canonical.certification::server-disk
     com.canonical.certification::server-info-attachment-automated
-    com.canonical.certification::server-firmware
     com.canonical.certification::server-miscellaneous
     com.canonical.certification::server-ethernet
+    com.canonical.certification::server-memory
+    com.canonical.certification::server-networking
 include:
     info/hdparm_.*.txt                         certification-status=non-blocker
     benchmarks/disk/hdparm-read_.*             certification-status=blocker
     benchmarks/disk/hdparm-cache-read_.*       certification-status=blocker
-    disk/detect                                certification-status=blocker
-    disk/stats_.*                              certification-status=blocker
-    disk/read_performance_.*                   certification-status=blocker
-    disk/smart_.*                              certification-status=non-blocker
-    disk/fstrim_.*                             certification-status=non-blocker
-    disk/disk_stress_ng_.*                     certification-status=blocker
-    disk/disk_cpu_load_.*                      certification-status=non-blocker
-    networking/predictable_names               certification-status=non-blocker
-    memory/info                                certification-status=blocker
-    stress/memory_stress_ng                    certification-status=blocker
     power-management/rtc                       certification-status=blocker
     stress/cpu_stress_ng_test                  certification-status=blocker
     virtualization/verify_lxd                  certification-status=blocker
-    miscellanea/oops                           certification-status=non-blocker
+    miscellanea/oops                           certification-status=blocker
     miscellanea/oops_results.log               certification-status=non-blocker
     miscellanea/olog                           certification-status=blocker
     miscellanea/olog_results.log