Merge #358456 from ~bladernr/plainbox-provider-checkbox:fwts-log-checks

2 files changed, 71 insertions, 0 deletions

diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu
index 5d8ee644..760d3014 100644
--- a/units/miscellanea/jobs.pxu
+++ b/units/miscellanea/jobs.pxu
@@ -314,11 +314,14 @@ _description:
 
 plugin:shell
 id: miscellanea/oops
+category_id: com.canonical.plainbox::miscellanea
 estimated_duration: 10.0
 requires: executable.name == 'fwts'
 user: root
 _description:
 Run Firmware Test Suite (fwts) oops tests.
+_summary:
+ Run FWTS OOPs check
 environ: PLAINBOX_SESSION_SHARE
 command:
 checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_oops_results.log -t oops
@@ -331,6 +334,52 @@ command:
 [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log
 _description: Attaches the FWTS oops results log to the submission
 
+plugin:shell
+id: miscellanea/olog
+category_id: com.canonical.plainbox::miscellanea
+estimated_duration: 10.0
+requires:
+ executable.name == 'fwts'
+ cpuinfo.platform in ("ppc64el")
+user: root
+_description:
+ Run Firmware Test Suite (fwts) olog tests (ppc64el only).
+_summary:
+ Run FWTS OLOG check on ppc64el
+environ: PLAINBOX_SESSION_SHARE
+command:
+ checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_olog_results.log -t olog
+
+plugin: attachment
+category_id: com.canonical.plainbox::miscellanea
+estimated_duration: 0.5
+id: miscellanea/olog_results.log
+command:
+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_olog_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_olog_results.log
+_description: Attaches the FWTS olog results log to the submission
+
+plugin:shell
+id: miscellanea/klog
+category_id: com.canonical.plainbox::miscellanea
+estimated_duration: 10.0
+requires: executable.name == 'fwts'
+user: root
+_description:
+ Run Firmware Test Suite (fwts) klog tests.
+_summary:
+ Run FWTS Kernel Log check
+environ: PLAINBOX_SESSION_SHARE
+command:
+ checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_klog_results.log -t oops
+
+plugin: attachment
+category_id: com.canonical.plainbox::miscellanea
+estimated_duration: 0.5
+id: miscellanea/klog_results.log
+command:
+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_klog_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_klog_results.log
+_description: Attaches the FWTS klog results log to the submission
+
 plugin: shell
 category_id: com.canonical.plainbox::miscellanea
 estimated_duration: 0.1
diff --git a/units/miscellanea/test-plan.pxu b/units/miscellanea/test-plan.pxu
index 758386e4..9c17b3af 100644
--- a/units/miscellanea/test-plan.pxu
+++ b/units/miscellanea/test-plan.pxu
@@ -53,3 +53,25 @@ include:
 miscellanea/oops_results.log
 bootstrap_include:
 fwts
+
+id: server-miscellaneous
+unit: test plan
+_name: Miscellaneous server cert tests
+_description:
+ Miscellaneous server tests (log checks, dmi data, etc)
+mandatory_include:
+ miscellanea/submission-resources
+ miscellanea/get_make_and_model
+ miscellanea/get_maas_version certification-status=blocker
+ miscellanea/efi_boot_mode certification-status=blocker
+ miscellanea/secure_boot_mode
+ miscellanea/efi_pxeboot
+ miscellanea/check_prerelease
+ miscellanea/cpus_are_not_samples
+ miscellanea/ipmi_test certification-status=blocker
+ miscellanea/bmc_info
+ miscellanea/fwupdate
+ miscellanea/dmitest_server
+ miscellanea/sosreport
+ miscellanea/sosreport_attachment
+include: