Provider for Plainbox - Canonical Certification Server

Merge ~bladernr/plainbox-provider-certification-server:1879390-use-cpu-nested-testplan into plainbox-provider-certification-server:master

  1. Git
  2. lp:~bladernr/plainbox-provider-certification-server
  3. 1879390-use-cpu-nested-testplan
  4. Merge into master
Proposed by Jeff Lane 
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 847a37bdf2d94f4baf372f2ab819f84f5204da17
Merged at revision: 2aac327b6fe5fe9af73c081f22a721d3d1ae3637
Proposed branch: ~bladernr/plainbox-provider-certification-server:1879390-use-cpu-nested-testplan
Merge into: plainbox-provider-certification-server:master
Diff against target: 237 lines (+10/-51)
10 files modified
units/cpu-only.pxu (+1/-6)
units/server-full-18.04.pxu (+1/-5)
units/server-full-20.04.pxu (+1/-5)
units/server-functional-18.04.pxu (+1/-5)
units/server-functional-20.04.pxu (+1/-5)
units/server-regression.pxu (+1/-5)
units/server-soc-cert-18.04.pxu (+1/-5)
units/server-soc-cert-20.04.pxu (+1/-5)
units/virtual-machine-full-18.04.pxu (+1/-5)
units/virtual-machine-full-20.04.pxu (+1/-5)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+384144@code.launchpad.net

Commit message

LP:1879390 Modify all test plans to use nested CPU test plan

Description of the change

LP:1879390 Modify all test plans to use nested CPU test plan

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/cpu-only.pxu b/units/cpu-only.pxu
2index 8bf6599..c87f02c 100644
3--- a/units/cpu-only.pxu
4+++ b/units/cpu-only.pxu
5@@ -7,15 +7,10 @@ _description:
6 Please use this whitelist for the Ubuntu Certification self-testing
7 programme.
8 nested_part:
9+ com.canonical.certification::cpu-server
10 com.canonical.certification::server-info-attachment-automated
11 com.canonical.certification::server-miscellaneous
12 include:
13- cpu/clocktest certification-status=blocker
14- cpu/scaling_test certification-status=blocker
15- cpu/scaling_test-log-attach certification-status=non-blocker
16- cpu/maxfreq_test certification-status=blocker
17- cpu/maxfreq_test-log-attach certification-status=non-blocker
18- cpu/topology certification-status=blocker
19 stress/cpu_stress_ng_test certification-status=blocker
20 miscellanea/oops certification-status=blocker
21 miscellanea/oops_results.log
22diff --git a/units/server-full-18.04.pxu b/units/server-full-18.04.pxu
23index e252da3..a88eec1 100644
24--- a/units/server-full-18.04.pxu
25+++ b/units/server-full-18.04.pxu
26@@ -7,6 +7,7 @@ _description:
27 Please use this whitelist for the Ubuntu Certification self-testing
28 programme.
29 nested_part:
30+ com.canonical.certification::cpu-server
31 com.canonical.certification::server-info-attachment-automated
32 com.canonical.certification::server-firmware
33 com.canonical.certification::server-miscellaneous
34@@ -16,11 +17,6 @@ include:
35 info/hdparm_.*.txt certification-status=non-blocker
36 benchmarks/disk/hdparm-read_.* certification-status=blocker
37 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
38- cpu/clocktest certification-status=blocker
39- cpu/frequency_governors certification-status=blocker
40- cpu/maxfreq_test certification-status=blocker
41- cpu/maxfreq_test-log-attach certification-status=non-blocker
42- cpu/topology certification-status=blocker
43 disk/detect certification-status=blocker
44 disk/stats_.* certification-status=blocker
45 disk/read_performance_.* certification-status=blocker
46diff --git a/units/server-full-20.04.pxu b/units/server-full-20.04.pxu
47index d5b023b..55c68ad 100644
48--- a/units/server-full-20.04.pxu
49+++ b/units/server-full-20.04.pxu
50@@ -7,6 +7,7 @@ _description:
51 Please use this whitelist for the Ubuntu Certification self-testing
52 programme.
53 nested_part:
54+ com.canonical.certification::cpu-server
55 com.canonical.certification::server-info-attachment-automated
56 com.canonical.certification::server-firmware
57 com.canonical.certification::server-miscellaneous
58@@ -16,11 +17,6 @@ include:
59 info/hdparm_.*.txt certification-status=non-blocker
60 benchmarks/disk/hdparm-read_.* certification-status=blocker
61 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
62- cpu/clocktest certification-status=blocker
63- cpu/frequency_governors certification-status=blocker
64- cpu/maxfreq_test certification-status=blocker
65- cpu/maxfreq_test-log-attach certification-status=non-blocker
66- cpu/topology certification-status=blocker
67 disk/detect certification-status=blocker
68 disk/stats_.* certification-status=blocker
69 disk/read_performance_.* certification-status=blocker
70diff --git a/units/server-functional-18.04.pxu b/units/server-functional-18.04.pxu
71index a1fe375..7fa0a87 100644
72--- a/units/server-functional-18.04.pxu
73+++ b/units/server-functional-18.04.pxu
74@@ -7,6 +7,7 @@ _description:
75 This test plan runs all server certification tests except for the really
76 demanding or lengthy ones.
77 nested_part:
78+ com.canonical.certification::cpu-server
79 com.canonical.certification::server-info-attachment-automated
80 com.canonical.certification::server-firmware
81 com.canonical.certification::server-miscellaneous
82@@ -16,11 +17,6 @@ include:
83 info/hdparm_.*.txt certification-status=non-blocker
84 benchmarks/disk/hdparm-read_.* certification-status=blocker
85 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
86- cpu/clocktest certification-status=blocker
87- cpu/frequency_governors certification-status=blocker
88- cpu/maxfreq_test certification-status=blocker
89- cpu/maxfreq_test-log-attach certification-status=non-blocker
90- cpu/topology certification-status=blocker
91 disk/detect certification-status=blocker
92 disk/stats_.* certification-status=blocker
93 disk/read_performance_.* certification-status=blocker
94diff --git a/units/server-functional-20.04.pxu b/units/server-functional-20.04.pxu
95index 2acee83..26a56f5 100644
96--- a/units/server-functional-20.04.pxu
97+++ b/units/server-functional-20.04.pxu
98@@ -7,6 +7,7 @@ _description:
99 This test plan runs all server certification tests except for the really
100 demanding or lengthy ones.
101 nested_part:
102+ com.canonical.certification::cpu-server
103 com.canonical.certification::server-info-attachment-automated
104 com.canonical.certification::server-firmware
105 com.canonical.certification::server-miscellaneous
106@@ -16,11 +17,6 @@ include:
107 info/hdparm_.*.txt certification-status=non-blocker
108 benchmarks/disk/hdparm-read_.* certification-status=blocker
109 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
110- cpu/clocktest certification-status=blocker
111- cpu/frequency_governors certification-status=blocker
112- cpu/maxfreq_test certification-status=blocker
113- cpu/maxfreq_test-log-attach certification-status=non-blocker
114- cpu/topology certification-status=blocker
115 disk/detect certification-status=blocker
116 disk/stats_.* certification-status=blocker
117 disk/read_performance_.* certification-status=blocker
118diff --git a/units/server-regression.pxu b/units/server-regression.pxu
119index c728a96..db6b321 100644
120--- a/units/server-regression.pxu
121+++ b/units/server-regression.pxu
122@@ -7,6 +7,7 @@ _description:
123 Please use this whitelist for the Ubuntu Certification self-testing
124 programme.
125 nested_part:
126+ com.canonical.certification::cpu-server
127 com.canonical.certification::server-info-attachment-automated
128 com.canonical.certification::server-firmware
129 com.canonical.certification::server-miscellaneous
130@@ -14,11 +15,6 @@ include:
131 info/hdparm_.*.txt certification-status=non-blocker
132 benchmarks/disk/hdparm-read_.* certification-status=blocker
133 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
134- cpu/clocktest certification-status=blocker
135- cpu/frequency_governors certification-status=blocker
136- cpu/maxfreq_test certification-status=blocker
137- cpu/maxfreq_test-log-attach certification-status=non-blocker
138- cpu/topology certification-status=blocker
139 disk/detect certification-status=blocker
140 disk/stats_.* certification-status=blocker
141 disk/read_performance_.* certification-status=blocker
142diff --git a/units/server-soc-cert-18.04.pxu b/units/server-soc-cert-18.04.pxu
143index 834f118..e924c8f 100644
144--- a/units/server-soc-cert-18.04.pxu
145+++ b/units/server-soc-cert-18.04.pxu
146@@ -6,6 +6,7 @@ _description:
147 contained here should work in any test lab envrionement. Please use this
148 whitelist for the Ubuntu Certification self-testing programme.
149 nested_part:
150+ com.canonical.certification::cpu-server
151 com.canonical.certification::server-info-attachment-automated
152 com.canonical.certification::server-firmware
153 com.canonical.certification::server-miscellaneous
154@@ -14,11 +15,6 @@ include:
155 info/hdparm_.*.txt certification-status=non-blocker
156 benchmarks/disk/hdparm-read_.*
157 benchmarks/disk/hdparm-cache-read_.*
158- cpu/clocktest certification-status=blocker
159- cpu/frequency_governors certification-status=blocker
160- cpu/maxfreq_test certification-status=blocker
161- cpu/maxfreq_test-log-attach certification-status=non-blocker
162- cpu/topology certification-status=blocker
163 disk/detect certification-status=blocker
164 disk/stats_.* certification-status=blocker
165 disk/read_performance_.* certification-status=blocker
166diff --git a/units/server-soc-cert-20.04.pxu b/units/server-soc-cert-20.04.pxu
167index 49cfbb1..3cb7b5a 100644
168--- a/units/server-soc-cert-20.04.pxu
169+++ b/units/server-soc-cert-20.04.pxu
170@@ -6,6 +6,7 @@ _description:
171 contained here should work in any test lab envrionement. Please use this
172 whitelist for the Ubuntu Certification self-testing programme.
173 nested_part:
174+ com.canonical.certification::cpu-server
175 com.canonical.certification::server-info-attachment-automated
176 com.canonical.certification::server-firmware
177 com.canonical.certification::server-miscellaneous
178@@ -14,11 +15,6 @@ include:
179 info/hdparm_.*.txt certification-status=non-blocker
180 benchmarks/disk/hdparm-read_.*
181 benchmarks/disk/hdparm-cache-read_.*
182- cpu/clocktest certification-status=blocker
183- cpu/frequency_governors certification-status=blocker
184- cpu/maxfreq_test certification-status=blocker
185- cpu/maxfreq_test-log-attach certification-status=non-blocker
186- cpu/topology certification-status=blocker
187 disk/detect certification-status=blocker
188 disk/stats_.* certification-status=blocker
189 disk/read_performance_.* certification-status=blocker
190diff --git a/units/virtual-machine-full-18.04.pxu b/units/virtual-machine-full-18.04.pxu
191index a624b7e..f54bc96 100644
192--- a/units/virtual-machine-full-18.04.pxu
193+++ b/units/virtual-machine-full-18.04.pxu
194@@ -7,6 +7,7 @@ _description:
195 envrionement. Please use this whitelist for the Ubuntu Certification
196 self-testing programme.
197 nested_part:
198+ com.canonical.certification::cpu-server
199 com.canonical.certification::server-info-attachment-automated
200 com.canonical.certification::server-firmware
201 com.canonical.certification::server-miscellaneous
202@@ -15,11 +16,6 @@ include:
203 info/hdparm_.*.txt certification-status=non-blocker
204 benchmarks/disk/hdparm-read_.* certification-status=blocker
205 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
206- cpu/clocktest certification-status=blocker
207- cpu/frequency_governors certification-status=blocker
208- cpu/maxfreq_test certification-status=blocker
209- cpu/maxfreq_test-log-attach certification-status=non-blocker
210- cpu/topology certification-status=blocker
211 disk/detect certification-status=blocker
212 disk/stats_.* certification-status=blocker
213 disk/read_performance_.* certification-status=blocker
214diff --git a/units/virtual-machine-full-20.04.pxu b/units/virtual-machine-full-20.04.pxu
215index fcedae9..85a1e28 100644
216--- a/units/virtual-machine-full-20.04.pxu
217+++ b/units/virtual-machine-full-20.04.pxu
218@@ -7,6 +7,7 @@ _description:
219 envrionement. Please use this whitelist for the Ubuntu Certification
220 self-testing programme.
221 nested_part:
222+ com.canonical.certification::cpu-server
223 com.canonical.certification::server-info-attachment-automated
224 com.canonical.certification::server-firmware
225 com.canonical.certification::server-miscellaneous
226@@ -15,11 +16,6 @@ include:
227 info/hdparm_.*.txt certification-status=non-blocker
228 benchmarks/disk/hdparm-read_.* certification-status=blocker
229 benchmarks/disk/hdparm-cache-read_.* certification-status=blocker
230- cpu/clocktest certification-status=blocker
231- cpu/frequency_governors certification-status=blocker
232- cpu/maxfreq_test certification-status=blocker
233- cpu/maxfreq_test-log-attach certification-status=non-blocker
234- cpu/topology certification-status=blocker
235 disk/detect certification-status=blocker
236 disk/stats_.* certification-status=blocker
237 disk/read_performance_.* certification-status=blocker

Subscribers

People subscribed via source and target branches