From 156deb31b6e06acb18660a6af872e7b92d7030b7 Mon Sep 17 00:00:00 2001
From: Jonathan Cave <jonathan.cave@canonical.com>
Date: Fri, 18 Jun 2021 10:40:58 +0100
Subject: Remove: firmware-uc20-fde checks

Compatibility with uc20 FDE functionality will now be tested using
FWTS
---
 units/firmware/jobs.pxu      | 44 --------------------------------------------
 units/firmware/test-plan.pxu | 27 ---------------------------
 2 files changed, 71 deletions(-)

(limited to 'units')

diff --git a/units/firmware/jobs.pxu b/units/firmware/jobs.pxu
index eb8397c..e03648d 100644
--- a/units/firmware/jobs.pxu
+++ b/units/firmware/jobs.pxu
@@ -105,47 +105,3 @@ plugin: attachment
 depends: firmware/fwts_dump
 command:
   [ -f "$PLAINBOX_SESSION_SHARE/acpidump.log" ] && gzip -c "$PLAINBOX_SESSION_SHARE/acpidump.log"
-
-
-id: firmware/tcglog-required-algs-sha256
-category_id: com.canonical.plainbox::firmware
-_summary: Test that the SHA256 algorithm is present in the TCG event log
-_description:
-  Presence of support for the SHA256 algorithm is a requirement for enabling FDE
-  support in Ubuntu Core 20 systems
-plugin: shell
-user: root
-command: tcglog-check -required-algs sha256
-imports: from com.canonical.plainbox import manifest
-requires:
-  cpuinfo.platform == 'x86_64'
-  manifest.has_tpm2_chip == 'True'
-  executable.name == 'tcglog-check'
-
-id: firmware/tcglog-require-pe-image-digests
-category_id: com.canonical.plainbox::firmware
-_summary: Test format of digests for EV_EFI_BOOT_SERVICES_APPLICATION events
-_description:
-  Digests for EV_EFI_BOOT_SERVICES_APPLICATION events associated with PE images
-  must be PE image digests rather than file digests. This test is a requirement
-  for enabling FDE support in Ubuntu Core 20 systems
-plugin: shell
-user: root
-command: tcglog-check -require-pe-image-digests
-imports: from com.canonical.plainbox import manifest
-requires:
-  cpuinfo.platform == 'x86_64'
-  manifest.has_tpm2_chip == 'True'
-  executable.name == 'tcglog-check'
-
-id: firmware/tcglog-dump-attachment
-category_id: com.canonical.plainbox::firmware
-_summary: Attach a dump of the TCG Event log for debugging
-plugin: attachment
-user: root
-command: tcglog-dump
-imports: from com.canonical.plainbox import manifest
-requires:
-  cpuinfo.platform == 'x86_64'
-  manifest.has_tpm2_chip == 'True'
-  executable.name == 'tcglog-dump'
diff --git a/units/firmware/test-plan.pxu b/units/firmware/test-plan.pxu
index 7db724d..4f63d19 100644
--- a/units/firmware/test-plan.pxu
+++ b/units/firmware/test-plan.pxu
@@ -11,33 +11,6 @@ bootstrap_include:
     fwts
 
 
-id: firmware-uc20-fde-full
-unit: test plan
-_name: Test firmware compatibility with UC20 FDE
-_description: Test firmware compatibility with UC20 FDE
-include:
-nested_part:
-    firmware-uc20-fde-manual
-    firmware-uc20-fde-automated
-
-
-id: firmware-uc20-fde-manual
-unit: test plan
-_name: Test firmware compatibility with UC20 FDE (manual)
-_description: Test firmware compatibility with UC20 FDE (manual)
-include:
-
-
-id: firmware-uc20-fde-automated
-unit: test plan
-_name: Test firmware compatibility with UC20 FDE (automated)
-_description: Test firmware compatibility with UC20 FDE (automated)
-include:
-  firmware/tcglog-required-algs-sha256
-  firmware/tcglog-require-pe-image-digests
-  firmware/tcglog-dump-attachment
-
-
 id: iot-fwts-full
 unit: test plan
 _name: Test fwts diagnosis with iot project
-- 
cgit v1.2.3