From c93f0e53cf8b6a722b25cb86d2438b97b8d8d565 Mon Sep 17 00:00:00 2001
From: Jeff Lane <jeffrey.lane@canonical.com>
Date: Wed, 7 Nov 2018 13:23:33 -0500
Subject: Add klog and olog tests to miscellanea for server.  Added server
 miscellanea test plan to start nesting in the server suite. LP: #1802152

---
 units/miscellanea/jobs.pxu      | 40 ++++++++++++++++++++++++++++++++++++++++
 units/miscellanea/test-plan.pxu | 23 +++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu
index 5d8ee64..10bcf73 100644
--- a/units/miscellanea/jobs.pxu
+++ b/units/miscellanea/jobs.pxu
@@ -331,6 +331,46 @@ 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
+estimated_duration: 10.0
+requires:
+ executable.name == 'fwts'
+ cpuinfo.platform in ("ppc64el")
+user: root
+_description:
+ Run Firmware Test Suite (fwts) olog tests (ppc64el only).
+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
+estimated_duration: 10.0
+requires: executable.name == 'fwts'
+user: root
+_description:
+ Run Firmware Test Suite (fwts) klog tests.
+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 758386e..93c0288 100644
--- a/units/miscellanea/test-plan.pxu
+++ b/units/miscellanea/test-plan.pxu
@@ -53,3 +53,26 @@ 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
+bootstrap_include:
+    fwts
-- 
cgit v1.2.3