Merge ~pieq/plainbox-provider-tpm2:remove-tpm2-tools-from-automated-test-plan into plainbox-provider-tpm2:master

[Pierre Equoy]

Tested using checkbox-cli list-boostrapped before/after applying the patch.

See here with Client Cert Desktop 22.04 and Ubuntu Core 22 ODM test plans:

https://pastebin.ubuntu.com/p/bQNrQBb5HX/

[Sylvain Pineau (sylvain-pineau)]

I've also considered this approach but problem is that tpm-cert-automated is also used by focal test plans:

plainbox-provider-certification-client/units$ grep -r tpm-cert-automated *20*
client-cert-desktop-20-04.pxu: tpm-cert-automated
client-cert-iot-ubuntucore-20.pxu: tpm-cert-automated
client-cert-odm-desktop-20-04.pxu: tpm-cert-automated
client-cert-odm-server-20-04.pxu: tpm-cert-automated
client-cert-odm-ubuntucore-20.pxu: tpm-cert-automated

Your commit is good, but I'd create another test plan to be used as a nested part in 20* test plans.

Something like:

 unit: test plan
 id: tpm-cert-focal-automated
 _name: TPM tests (Automated)
 _description:
   TPM tests that should be run as part of Certification.
   Include the tpm2-tools 4.1.1 integration tests for 20.04/UC20.
 include:
     tpm2/fwts-event-log-dump
 nested_part:
     tpm2.0_4.1.1-automated
     clevis-automated

review: Needs Fixing

[Sylvain Pineau (sylvain-pineau)]

+1, thanks

review: Approve

[Pierre Equoy (pieq)]

Thanks for catching this up, Sylvain.

Here is the updated version, tested after pointing the 20.04/UC20 test plans to `tpm-cert-focal-automated`.

Output after applying the patch, for all the test plans you mentioned + the 22.04/UC22 ones:

https://pastebin.ubuntu.com/p/BJ2ZKtCvbj/

diff --git a/units/test-plan.pxu b/units/test-plan.pxu
index b2e7f83..521cad5 100644
--- a/units/test-plan.pxu
+++ b/units/test-plan.pxu
@@ -114,6 +114,18 @@ _description:
 include:
 
 unit: test plan
+id: tpm-cert-focal-automated
+_name: TPM tests for Ubuntu 20.04 Focal Fossa (Automated)
+_description:
+  TPM tests that should be run as part of Certification.
+  Include the tpm2-tools 4.1.1 integration tests for 20.04/UC20.
+include:
+    tpm2/fwts-event-log-dump
+nested_part:
+    tpm2.0_4.1.1-automated
+    clevis-automated
+
+unit: test plan
 id: tpm-cert-automated
 _name: TPM tests (Automated)
 _description:
@@ -122,5 +134,4 @@ _description:
 include:
     tpm2/fwts-event-log-dump
 nested_part:
-    tpm2.0_4.1.1-automated
     clevis-automated