From 84878c2884f9b084fb77b02371d21fba8efd35e5 Mon Sep 17 00:00:00 2001 From: Jeff Lane Date: Fri, 19 Apr 2024 13:03:07 -0400 Subject: [PATCH] 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 --- .../{certify-20.04 => certify-ubuntu-server} | 2 +- ...fy-soc-20.04 => certify-ubuntu-server-soc} | 2 +- ...ctional-20.04 => certify-ubuntu-server-vm} | 2 +- .../{certify-vm-20.04 => test-functional} | 2 +- ...{server-full-20.04.pxu => server-full.pxu} | 25 +++++++------------ ...tional-20.04.pxu => server-functional.pxu} | 25 +++++++------------ ...soc-cert-20.04.pxu => server-soc-cert.pxu} | 17 ++++--------- ...ull-20.04.pxu => virtual-machine-full.pxu} | 20 +++++---------- 8 files changed, 33 insertions(+), 62 deletions(-) rename providers/certification-server/launcher/{certify-20.04 => certify-ubuntu-server} (85%) rename providers/certification-server/launcher/{certify-soc-20.04 => certify-ubuntu-server-soc} (84%) rename providers/certification-server/launcher/{test-functional-20.04 => certify-ubuntu-server-vm} (84%) rename providers/certification-server/launcher/{certify-vm-20.04 => test-functional} (83%) rename providers/certification-server/units/{server-full-20.04.pxu => server-full.pxu} (56%) rename providers/certification-server/units/{server-functional-20.04.pxu => server-functional.pxu} (55%) rename providers/certification-server/units/{server-soc-cert-20.04.pxu => server-soc-cert.pxu} (64%) rename providers/certification-server/units/{virtual-machine-full-20.04.pxu => virtual-machine-full.pxu} (60%) diff --git a/providers/certification-server/launcher/certify-20.04 b/providers/certification-server/launcher/certify-ubuntu-server similarity index 85% rename from providers/certification-server/launcher/certify-20.04 rename to providers/certification-server/launcher/certify-ubuntu-server index 3653a01336..660b16bd99 100755 --- a/providers/certification-server/launcher/certify-20.04 +++ b/providers/certification-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/providers/certification-server/launcher/certify-soc-20.04 b/providers/certification-server/launcher/certify-ubuntu-server-soc similarity index 84% rename from providers/certification-server/launcher/certify-soc-20.04 rename to providers/certification-server/launcher/certify-ubuntu-server-soc index ff3021f162..38f53970b9 100755 --- a/providers/certification-server/launcher/certify-soc-20.04 +++ b/providers/certification-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/providers/certification-server/launcher/test-functional-20.04 b/providers/certification-server/launcher/certify-ubuntu-server-vm similarity index 84% rename from providers/certification-server/launcher/test-functional-20.04 rename to providers/certification-server/launcher/certify-ubuntu-server-vm index 28bdd69ef5..49b642beee 100755 --- a/providers/certification-server/launcher/test-functional-20.04 +++ b/providers/certification-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/providers/certification-server/launcher/certify-vm-20.04 b/providers/certification-server/launcher/test-functional similarity index 83% rename from providers/certification-server/launcher/certify-vm-20.04 rename to providers/certification-server/launcher/test-functional index 030fa3b21e..384635ddb5 100755 --- a/providers/certification-server/launcher/certify-vm-20.04 +++ b/providers/certification-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/providers/certification-server/units/server-full-20.04.pxu b/providers/certification-server/units/server-full.pxu similarity index 56% rename from providers/certification-server/units/server-full-20.04.pxu rename to providers/certification-server/units/server-full.pxu index 1b99671986..9b78df03ff 100644 --- a/providers/certification-server/units/server-full-20.04.pxu +++ b/providers/certification-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/providers/certification-server/units/server-functional-20.04.pxu b/providers/certification-server/units/server-functional.pxu similarity index 55% rename from providers/certification-server/units/server-functional-20.04.pxu rename to providers/certification-server/units/server-functional.pxu index 0a7067d82e..70db8a3d91 100644 --- a/providers/certification-server/units/server-functional-20.04.pxu +++ b/providers/certification-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/providers/certification-server/units/server-soc-cert-20.04.pxu b/providers/certification-server/units/server-soc-cert.pxu similarity index 64% rename from providers/certification-server/units/server-soc-cert-20.04.pxu rename to providers/certification-server/units/server-soc-cert.pxu index 66c3b35555..310d1086d4 100644 --- a/providers/certification-server/units/server-soc-cert-20.04.pxu +++ b/providers/certification-server/units/server-soc-cert.pxu @@ -1,5 +1,5 @@ -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 @@ -7,25 +7,18 @@ _description: 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/providers/certification-server/units/virtual-machine-full-20.04.pxu b/providers/certification-server/units/virtual-machine-full.pxu similarity index 60% rename from providers/certification-server/units/virtual-machine-full-20.04.pxu rename to providers/certification-server/units/virtual-machine-full.pxu index 4957487595..ae5f74167b 100644 --- a/providers/certification-server/units/virtual-machine-full-20.04.pxu +++ b/providers/certification-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