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