From 38052b9a5a5de850cafd6e2713cb053a23930c27 Mon Sep 17 00:00:00 2001
From: Jeff Lane <jeffrey.lane@canonical.com>
Date: Tue, 6 Nov 2018 15:29:45 -0500
Subject: Added server focused fwts jobs to firmware/jobs.pxu. Added new
 test-plan.pxu with a test plan to nest in server test plans. LP: #1801963

---
 units/firmware/jobs.pxu      | 22 ++++++++++++++++++++++
 units/firmware/test-plan.pxu | 10 ++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 units/firmware/test-plan.pxu

(limited to 'units')

diff --git a/units/firmware/jobs.pxu b/units/firmware/jobs.pxu
index 5c8dcee..4dae484 100644
--- a/units/firmware/jobs.pxu
+++ b/units/firmware/jobs.pxu
@@ -74,3 +74,25 @@ user: root
 estimated_duration: 0.5
 command: ! sudo grep -r "_REV" /sys/firmware/acpi/tables/* | grep [DS]SDT
 _description: This Automated test checks misuse of the _REV interface in ACPI DSDT and SSDT tables
+
+plugin:shell
+category_id: com.canonical.plainbox::firmware
+id: firmware/fwts_server
+estimated_duration: 10.0
+requires: executable.name == 'fwts'
+user: root
+_description:
+ Run Firmware Test Suite (fwts) Server Cert selected tests.
+_summary: Run FWTS Server Cert selected tests.
+environ: PLAINBOX_SESSION_SHARE
+command:
+ checkbox-support-fwts_test --server -q -l $PLAINBOX_SESSION_SHARE/fwts_server_results.log
+
+plugin: attachment
+category_id: com.canonical.plainbox::firmware
+estimated_duration: 0.5
+id: firmware/fwts_server_results.log_gz
+command:
+ [ -f $PLAINBOX_SESSION_SHARE/fwts_server_results.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_server_results.log
+_description: Attaches the FWTS Server Cert results log to the submission
+_summary: Attach FWTS Server Cert test log to submission
diff --git a/units/firmware/test-plan.pxu b/units/firmware/test-plan.pxu
new file mode 100644
index 0000000..ec38576
--- /dev/null
+++ b/units/firmware/test-plan.pxu
@@ -0,0 +1,10 @@
+id: server-firmware
+unit: test plan
+_name: Server Firmware Tests
+_description:
+ Server Focused Firmware Tests
+mandatory_include:
+    firmware/fwts_server
+    firmware/fwts_results.log_gz
+bootstrap_include:
+    fwts
-- 
cgit v1.2.3


From ec9d092738691513a4217d352537add4013e4256 Mon Sep 17 00:00:00 2001
From: Jeffrey Lane <jeffrey.lane@canonical.com>
Date: Thu, 15 Nov 2018 21:31:12 -0500
Subject: added missing include: to testplan

---
 units/firmware/test-plan.pxu | 1 +
 1 file changed, 1 insertion(+)

(limited to 'units')

diff --git a/units/firmware/test-plan.pxu b/units/firmware/test-plan.pxu
index ec38576..62b4e05 100644
--- a/units/firmware/test-plan.pxu
+++ b/units/firmware/test-plan.pxu
@@ -6,5 +6,6 @@ _description:
 mandatory_include:
     firmware/fwts_server
     firmware/fwts_results.log_gz
+include:
 bootstrap_include:
     fwts
-- 
cgit v1.2.3