Merge ~bladernr/plainbox-provider-certification-server:1968023-add-22.04-launcher-testplans into plainbox-provider-certification-server:master

[Jeff Lane ]

Update launchers and testplans in prep for 22.04 launch

[Jeff Lane  (bladernr)]

Packaging update will follow shortly

[Rod Smith (rodsmith)]

LGTM.

review: Approve

diff --git a/launcher/certify-22.04 b/launcher/certify-22.04
new file mode 100755
index 0000000..75f6b7e
--- /dev/null
+++ b/launcher/certify-22.04
@@ -0,0 +1,19 @@
+#!/usr/bin/env checkbox-cli
+
+[launcher]
+app_id = com.canonical.certification:certification-server
+launcher_version = 1
+stock_reports = submission_files, certification
+
+[test plan]
+unit = com.canonical.certification::22.04-server-full
+forced = yes
+
+[test selection]
+forced = yes
+
+[ui]
+output = hide-resource-and-attachment
+
+[config]
+config_filename = canonical-certification.conf
diff --git a/launcher/certify-soc-22.04 b/launcher/certify-soc-22.04
new file mode 100755
index 0000000..03bb234
--- /dev/null
+++ b/launcher/certify-soc-22.04
@@ -0,0 +1,19 @@
+#!/usr/bin/env checkbox-cli
+
+[launcher]
+app_id = com.canonical.certification:certification-server
+launcher_version = 1
+stock_reports = submission_files, certification
+
+[test plan]
+unit = com.canonical.certification::22.04-server-soc-cert
+forced = yes
+
+[test selection]
+forced = yes
+
+[ui]
+output = hide-resource-and-attachment
+
+[config]
+config_filename = canonical-certification.conf
diff --git a/launcher/certify-vm-22.04 b/launcher/certify-vm-22.04
new file mode 100755
index 0000000..1d8fd97
--- /dev/null
+++ b/launcher/certify-vm-22.04
@@ -0,0 +1,19 @@
+#!/usr/bin/env checkbox-cli
+
+[launcher]
+app_id = com.canonical.certification:certification-server
+launcher_version = 1
+stock_reports = submission_files, certification
+
+[test plan]
+unit = com.canonical.certification::22.04-virtual-machine-full
+forced = yes
+
+[test selection]
+forced = yes
+
+[ui]
+output = hide-resource-and-attachment
+
+[config]
+config_filename = canonical-certification.conf
diff --git a/launcher/test-functional-22.04 b/launcher/test-functional-22.04
new file mode 100755
index 0000000..3e497e8
--- /dev/null
+++ b/launcher/test-functional-22.04
@@ -0,0 +1,19 @@
+#!/usr/bin/env checkbox-cli
+
+[launcher]
+app_id = com.canonical.certification:certification-server
+launcher_version = 1
+stock_reports = submission_files, certification
+
+[test plan]
+unit = com.canonical.certification::22.04-server-functional
+forced = yes
+
+[test selection]
+forced = yes
+
+[ui]
+output = hide-resource-and-attachment
+
+[config]
+config_filename = canonical-certification.conf
diff --git a/units/nvdimm-only.pxu b/units/nvdimm-only.pxu
index 1e0568a..8d2ab92 100644
--- a/units/nvdimm-only.pxu
+++ b/units/nvdimm-only.pxu
@@ -22,7 +22,6 @@ include:
     disk/fstrim_.*                             certification-status=non-blocker
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     memory/info                                certification-status=blocker
     memory/memory_stress_ng                    certification-status=blocker
     miscellanea/oops                           certification-status=non-blocker
diff --git a/units/server-full-18.04.pxu b/units/server-full-18.04.pxu
index 2234956..9769a77 100644
--- a/units/server-full-18.04.pxu
+++ b/units/server-full-18.04.pxu
@@ -26,7 +26,6 @@ include:
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
     networking/predictable_names               certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     memory/info                                certification-status=blocker
     memory/memory_stress_ng                    certification-status=blocker
     optical/detect                             certification-status=non-blocker
diff --git a/units/server-full-20.04.pxu b/units/server-full-20.04.pxu
index 4ba3f67..4e0d78a 100644
--- a/units/server-full-20.04.pxu
+++ b/units/server-full-20.04.pxu
@@ -26,7 +26,6 @@ include:
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
     networking/predictable_names               certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     memory/info                                certification-status=blocker
     memory/memory_stress_ng                    certification-status=blocker
     optical/detect                             certification-status=non-blocker
diff --git a/units/server-full-22.04.pxu b/units/server-full-22.04.pxu
new file mode 100644
index 0000000..db7de99
--- /dev/null
+++ b/units/server-full-22.04.pxu
@@ -0,0 +1,44 @@
+id: 22.04-server-full
+_name: 22.04 Server Certification Full
+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.
+nested_part:
+    com.canonical.certification::cpu-server
+    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::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=blocker
+    networking/predictable_names               certification-status=blocker
+    memory/info                                certification-status=blocker
+    memory/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
+    virtualization/kvm_check_vm                certification-status=blocker
+    info/kvm_output                            certification-status=non-blocker
+    miscellanea/oops                           certification-status=blocker
+    miscellanea/oops_results.log
+    miscellanea/olog                           certification-status=blocker
+    miscellanea/olog_results.log
+    miscellanea/klog                           certification-status=blocker
+    miscellanea/klog_results.log
+bootstrap_include:
+    device
+    fwts
diff --git a/units/server-functional-18.04.pxu b/units/server-functional-18.04.pxu
index 3be0613..1b655fc 100644
--- a/units/server-functional-18.04.pxu
+++ b/units/server-functional-18.04.pxu
@@ -26,7 +26,6 @@ include:
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
     networking/predictable_names               certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     memory/info                                certification-status=blocker
     optical/detect                             certification-status=non-blocker
     optical/read-automated_.*                  certification-status=non-blocker
@@ -36,6 +35,10 @@ include:
     info/kvm_output                            certification-status=non-blocker
     miscellanea/oops                           certification-status=non-blocker
     miscellanea/oops_results.log               certification-status=non-blocker
+    miscellanea/olog                           certification-status=blocker
+    miscellanea/olog_results.log
+    miscellanea/klog                           certification-status=blocker
+    miscellanea/klog_results.log
 bootstrap_include:
     device
     fwts
diff --git a/units/server-functional-20.04.pxu b/units/server-functional-20.04.pxu
index 744c8dd..37efaa6 100644
--- a/units/server-functional-20.04.pxu
+++ b/units/server-functional-20.04.pxu
@@ -26,7 +26,6 @@ include:
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
     networking/predictable_names               certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     memory/info                                certification-status=blocker
     optical/detect                             certification-status=non-blocker
     optical/read-automated_.*                  certification-status=non-blocker
@@ -36,6 +35,10 @@ include:
     info/kvm_output                            certification-status=non-blocker
     miscellanea/oops                           certification-status=non-blocker
     miscellanea/oops_results.log               certification-status=non-blocker
+    miscellanea/olog                           certification-status=blocker
+    miscellanea/olog_results.log
+    miscellanea/klog                           certification-status=blocker
+    miscellanea/klog_results.log
 bootstrap_include:
     device
     fwts
diff --git a/units/server-functional-22.04.pxu b/units/server-functional-22.04.pxu
new file mode 100644
index 0000000..9cae930
--- /dev/null
+++ b/units/server-functional-22.04.pxu
@@ -0,0 +1,42 @@
+id: 22.04-server-functional
+_name: 22.04 Server Certification Functional
+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.
+nested_part:
+    com.canonical.certification::cpu-server
+    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::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=blocker
+    networking/predictable_names               certification-status=blocker
+    memory/info                                certification-status=blocker
+    power-management/rtc                       certification-status=blocker
+    virtualization/verify_lxd                  certification-status=blocker
+    virtualization/kvm_check_vm                certification-status=blocker
+    info/kvm_output                            certification-status=non-blocker
+    miscellanea/oops                           certification-status=non-blocker
+    miscellanea/oops_results.log               certification-status=non-blocker
+    miscellanea/olog                           certification-status=blocker
+    miscellanea/olog_results.log
+    miscellanea/klog                           certification-status=blocker
+    miscellanea/klog_results.log
+bootstrap_include:
+    device
+    fwts
diff --git a/units/server-soc-cert-18.04.pxu b/units/server-soc-cert-18.04.pxu
index 1a21563..f84b632 100644
--- a/units/server-soc-cert-18.04.pxu
+++ b/units/server-soc-cert-18.04.pxu
@@ -14,8 +14,8 @@ nested_part:
     com.canonical.certification::server-usb
 include:
     info/hdparm_.*.txt                         certification-status=non-blocker
-    benchmarks/disk/hdparm-read_.*
-    benchmarks/disk/hdparm-cache-read_.*
+    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
@@ -24,7 +24,6 @@ include:
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
     networking/predictable_names               certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     memory/info                                certification-status=blocker
     memory/memory_stress_ng                    certification-status=blocker
     power-management/rtc                       certification-status=blocker
@@ -33,7 +32,7 @@ include:
     virtualization/kvm_check_vm                certification-status=blocker
     info/kvm_output                            certification-status=non-blocker
     miscellanea/oops                           certification-status=non-blocker
-    miscellanea/oops_results.log               certification-status=non-blocker
+    miscellanea/oops_results.log
     miscellanea/olog                           certification-status=blocker
     miscellanea/olog_results.log
     miscellanea/klog                           certification-status=blocker
diff --git a/units/server-soc-cert-20.04.pxu b/units/server-soc-cert-20.04.pxu
index c913564..db7b4e7 100644
--- a/units/server-soc-cert-20.04.pxu
+++ b/units/server-soc-cert-20.04.pxu
@@ -14,8 +14,8 @@ nested_part:
     com.canonical.certification::server-usb
 include:
     info/hdparm_.*.txt                         certification-status=non-blocker
-    benchmarks/disk/hdparm-read_.*
-    benchmarks/disk/hdparm-cache-read_.*
+    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
@@ -24,7 +24,6 @@ include:
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
     networking/predictable_names               certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     memory/info                                certification-status=blocker
     memory/memory_stress_ng                    certification-status=blocker
     power-management/rtc                       certification-status=blocker
@@ -33,7 +32,7 @@ include:
     virtualization/kvm_check_vm                certification-status=blocker
     info/kvm_output                            certification-status=non-blocker
     miscellanea/oops                           certification-status=non-blocker
-    miscellanea/oops_results.log               certification-status=non-blocker
+    miscellanea/oops_results.log
     miscellanea/olog                           certification-status=blocker
     miscellanea/olog_results.log
     miscellanea/klog                           certification-status=blocker
diff --git a/units/server-soc-cert-22.04.pxu b/units/server-soc-cert-22.04.pxu
new file mode 100644
index 0000000..2c825c2
--- /dev/null
+++ b/units/server-soc-cert-22.04.pxu
@@ -0,0 +1,42 @@
+id: 22.04-server-soc-cert
+_name: 22.04 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::cpu-server
+    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-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
+    memory/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
+    virtualization/kvm_check_vm                certification-status=blocker
+    info/kvm_output                            certification-status=non-blocker
+    miscellanea/oops                           certification-status=non-blocker
+    miscellanea/oops_results.log
+    miscellanea/olog                           certification-status=blocker
+    miscellanea/olog_results.log
+    miscellanea/klog                           certification-status=blocker
+    miscellanea/klog_results.log
+bootstrap_include:
+    device
+    fwts
diff --git a/units/server-ubuntucore-20.pxu b/units/server-ubuntucore-20.pxu
index e5121bb..f48ac32 100644
--- a/units/server-ubuntucore-20.pxu
+++ b/units/server-ubuntucore-20.pxu
@@ -30,7 +30,6 @@ include:
   disk/disk_stress_ng_.*                     certification-status=blocker
   disk/disk_cpu_load_.*                      certification-status=non-blocker
   networking/predictable_names               certification-status=non-blocker
-  mediacard/sd-preinserted-server            certification-status=blocker
   memory/info                                certification-status=blocker
   memory/memory_stress_ng                    certification-status=blocker
   optical/detect                             certification-status=non-blocker
diff --git a/units/storage-only.pxu b/units/storage-only.pxu
index 7ef24f4..d6d936c 100644
--- a/units/storage-only.pxu
+++ b/units/storage-only.pxu
@@ -22,7 +22,6 @@ include:
     disk/fstrim_.*                             certification-status=non-blocker
     disk/disk_stress_ng_.*                     certification-status=blocker
     disk/disk_cpu_load_.*                      certification-status=non-blocker
-    mediacard/sd-preinserted-server            certification-status=blocker
     miscellanea/oops                           certification-status=non-blocker
     miscellanea/oops_results.log               certification-status=non-blocker
     miscellanea/olog                           certification-status=blocker
diff --git a/units/virtual-machine-full-22.04.pxu b/units/virtual-machine-full-22.04.pxu
new file mode 100644
index 0000000..e00cd72
--- /dev/null
+++ b/units/virtual-machine-full-22.04.pxu
@@ -0,0 +1,40 @@
+id: 22.04-virtual-machine-full
+_name: 22.04 Virtual Machine Full (For Hypervisors)
+unit: test plan
+_description:
+    This whitelist is intended to be used for testing Ubuntu Guests on 
+    hypervisors. 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::cpu-server
+    com.canonical.certification::server-info-attachment-automated
+    com.canonical.certification::server-firmware
+    com.canonical.certification::server-miscellaneous
+    com.canonical.certification::server-ethernet
+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=blocker
+    memory/info                                certification-status=blocker
+    memory/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=blocker
+    miscellanea/oops_results.log               certification-status=non-blocker
+    miscellanea/olog                           certification-status=blocker
+    miscellanea/olog_results.log
+    miscellanea/klog                           certification-status=blocker
+    miscellanea/klog_results.log
+bootstrap_include:
+    device
+    fwts