Merge ~jocave/plainbox-provider-certification-client:use-tpm-cert-nested-parts into plainbox-provider-certification-client:master

Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: 9ce11d7be644b291e4476d497a50cd1b2887acf4
Merged at revision: 88ad49b76bfb0d8d7eddfdf59d110d61a74aa09f
Proposed branch: ~jocave/plainbox-provider-certification-client:use-tpm-cert-nested-parts
Merge into: plainbox-provider-certification-client:master
Diff against target: 52 lines (+4/-4)
4 files modified
units/client-cert-iot-ubuntucore-20.pxu (+1/-1)
units/client-cert-odm-desktop-20-04.pxu (+1/-1)
units/client-cert-odm-server-20-04.pxu (+1/-1)
units/client-cert-odm-ubuntucore-20.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+406399@code.launchpad.net

Description of the change

Depends on https://code.launchpad.net/~jocave/plainbox-provider-tpm2/+git/plainbox-provider-tpm2/+merge/406387

Use the "generic" nested test plans rather than implementation specific plans. Should be no-change to tests selected at this time.

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

self-approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/client-cert-iot-ubuntucore-20.pxu b/units/client-cert-iot-ubuntucore-20.pxu
2index 3b4c878..8a432cb 100644
3--- a/units/client-cert-iot-ubuntucore-20.pxu
4+++ b/units/client-cert-iot-ubuntucore-20.pxu
5@@ -151,7 +151,7 @@ nested_part:
6 snappy-snap-automated
7 socketcan-auto-local
8 socketcan-auto-remote
9- tpm2.0_4.1.1-automated
10+ tpm-cert-automated
11 usb-automated
12 thunderbolt-cert-automated
13 watchdog-automated
14diff --git a/units/client-cert-odm-desktop-20-04.pxu b/units/client-cert-odm-desktop-20-04.pxu
15index c277539..d667fd9 100644
16--- a/units/client-cert-odm-desktop-20-04.pxu
17+++ b/units/client-cert-odm-desktop-20-04.pxu
18@@ -111,7 +111,7 @@ nested_part:
19 cold-boot-stress-test
20 suspend-stress-test
21 stress-ng-cert-automated
22- tpm2.0_4.1.1-automated
23+ tpm-cert-automated
24
25 id: client-cert-odm-desktop-20-04
26 _name: DONT USE - desktop-20-04 - placeholder to establish that total number of tests has not changed
27diff --git a/units/client-cert-odm-server-20-04.pxu b/units/client-cert-odm-server-20-04.pxu
28index 6c7652e..e3b3f15 100644
29--- a/units/client-cert-odm-server-20-04.pxu
30+++ b/units/client-cert-odm-server-20-04.pxu
31@@ -124,7 +124,7 @@ nested_part:
32 snappy-snap-automated
33 wireless-automated
34 wireless-wifi-master-mode-auto
35- tpm2.0_4.1.1-automated
36+ tpm-cert-automated
37 suspend-tp
38 after-suspend-bluez-automated
39 after-suspend-ethernet-automated
40diff --git a/units/client-cert-odm-ubuntucore-20.pxu b/units/client-cert-odm-ubuntucore-20.pxu
41index 981a819..6f0975b 100644
42--- a/units/client-cert-odm-ubuntucore-20.pxu
43+++ b/units/client-cert-odm-ubuntucore-20.pxu
44@@ -125,7 +125,7 @@ nested_part:
45 snappy-snap-automated
46 wireless-automated
47 wireless-wifi-master-mode-auto
48- tpm2.0_4.1.1-automated
49+ tpm-cert-automated
50 suspend-tp
51 after-suspend-bluez-automated
52 after-suspend-ethernet-automated

Subscribers

People subscribed via source and target branches