Merge ~bladernr/plainbox-provider-certification-server:1832233-fix-server-mediacard-test into plainbox-provider-certification-server:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: 9a0152121e9144b315456b7abd6a0272fd0d1d98
Merged at revision: 5cc2afb40435624bf19d56643133ad35871071c7
Proposed branch: ~bladernr/plainbox-provider-certification-server:1832233-fix-server-mediacard-test
Merge into: plainbox-provider-certification-server:master
Diff against target: 228 lines (+27/-27)
13 files modified
units/firmware-tests.pxu (+2/-2)
units/network-only-16.04.pxu (+3/-3)
units/network-only-18.04.pxu (+3/-3)
units/network-only-underspeed.pxu (+3/-3)
units/server-full-16.04.pxu (+3/-3)
units/server-full-18.04.pxu (+1/-1)
units/server-functional-16.04.pxu (+3/-3)
units/server-functional-18.04.pxu (+1/-1)
units/server-regression-full.pxu (+1/-1)
units/server-soc-cert-16.04.pxu (+3/-3)
units/server-soc-cert-18.04.pxu (+1/-1)
units/storage-only.pxu (+1/-1)
units/virtual-machine-full-16.04.pxu (+2/-2)
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Maciej Kisielewski Needs Fixing
Review via email: mp+368613@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

I think that 'certification-status=blocker' marker could use some aligning

review: Needs Fixing
Revision history for this message
Jeff Lane  (bladernr) wrote :

self-approve after making modifications based on kissiel's comments.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/firmware-tests.pxu b/units/firmware-tests.pxu
2index f9694cc..83df851 100644
3--- a/units/firmware-tests.pxu
4+++ b/units/firmware-tests.pxu
5@@ -19,9 +19,9 @@ include:
6 memory/info
7 miscellanea/oops certification-status=non-blocker
8 miscellanea/oops_results.log certification-status=non-blocker
9- miscellanea/olog certification-status=blocker
10+ miscellanea/olog certification-status=blocker
11 miscellanea/olog_results.log
12- miscellanea/klog certification-status=blocker
13+ miscellanea/klog certification-status=blocker
14 miscellanea/klog_results.log
15 bootstrap_include:
16 device
17diff --git a/units/network-only-16.04.pxu b/units/network-only-16.04.pxu
18index b4d676c..7cc213f 100644
19--- a/units/network-only-16.04.pxu
20+++ b/units/network-only-16.04.pxu
21@@ -12,12 +12,12 @@ nested_part:
22 com.canonical.certification::server-miscellaneous
23 com.canonical.certification::server-ethernet
24 include:
25- networking/predictable_names certification-status=non-blocker
26+ networking/predictable_names certification-status=non-blocker
27 miscellanea/oops certification-status=non-blocker
28 miscellanea/oops_results.log certification-status=non-blocker
29- miscellanea/olog certification-status=blocker
30+ miscellanea/olog certification-status=blocker
31 miscellanea/olog_results.log
32- miscellanea/klog certification-status=blocker
33+ miscellanea/klog certification-status=blocker
34 miscellanea/klog_results.log
35 bootstrap_include:
36 device
37diff --git a/units/network-only-18.04.pxu b/units/network-only-18.04.pxu
38index 920f26d..638b44d 100644
39--- a/units/network-only-18.04.pxu
40+++ b/units/network-only-18.04.pxu
41@@ -12,12 +12,12 @@ nested_part:
42 com.canonical.certification::server-miscellaneous
43 com.canonical.certification::server-ethernet
44 include:
45- networking/predictable_names certification-status=non-blocker
46+ networking/predictable_names certification-status=non-blocker
47 miscellanea/oops certification-status=non-blocker
48 miscellanea/oops_results.log certification-status=non-blocker
49- miscellanea/olog certification-status=blocker
50+ miscellanea/olog certification-status=blocker
51 miscellanea/olog_results.log
52- miscellanea/klog certification-status=blocker
53+ miscellanea/klog certification-status=blocker
54 miscellanea/klog_results.log
55 bootstrap_include:
56 device
57diff --git a/units/network-only-underspeed.pxu b/units/network-only-underspeed.pxu
58index acd1aaa..443c912 100644
59--- a/units/network-only-underspeed.pxu
60+++ b/units/network-only-underspeed.pxu
61@@ -13,12 +13,12 @@ nested_part:
62 com.canonical.certification::server-miscellaneous
63 com.canonical.certification::server-ethernet-underspeed
64 include:
65- networking/predictable_names certification-status=non-blocker
66+ networking/predictable_names certification-status=non-blocker
67 miscellanea/oops certification-status=non-blocker
68 miscellanea/oops_results.log certification-status=non-blocker
69- miscellanea/olog certification-status=blocker
70+ miscellanea/olog certification-status=blocker
71 miscellanea/olog_results.log
72- miscellanea/klog certification-status=blocker
73+ miscellanea/klog certification-status=blocker
74 miscellanea/klog_results.log
75 bootstrap_include:
76 device
77diff --git a/units/server-full-16.04.pxu b/units/server-full-16.04.pxu
78index 85db087..db96372 100644
79--- a/units/server-full-16.04.pxu
80+++ b/units/server-full-16.04.pxu
81@@ -28,7 +28,7 @@ include:
82 disk/disk_stress_ng_.* certification-status=blocker
83 disk/disk_cpu_load_.* certification-status=non-blocker
84 networking/predictable_names certification-status=non-blocker
85- mediacard/sd-preinserted certification-status=blocker
86+ mediacard/sd-preinserted-server certification-status=blocker
87 memory/info certification-status=blocker
88 memory/memory_stress_ng certification-status=blocker
89 optical/detect certification-status=non-blocker
90@@ -41,8 +41,8 @@ include:
91 virtualization/verify_lxd certification-status=non-blocker
92 virtualization/kvm_check_vm certification-status=blocker
93 info/kvm_output certification-status=non-blocker
94- miscellanea/oops certification-status=non-blocker
95- miscellanea/oops_results.log certification-status=non-blocker
96+ miscellanea/oops certification-status=non-blocker
97+ miscellanea/oops_results.log certification-status=non-blocker
98 miscellanea/olog certification-status=blocker
99 miscellanea/olog_results.log
100 miscellanea/klog certification-status=blocker
101diff --git a/units/server-full-18.04.pxu b/units/server-full-18.04.pxu
102index 67157a3..cbd89db 100644
103--- a/units/server-full-18.04.pxu
104+++ b/units/server-full-18.04.pxu
105@@ -28,7 +28,7 @@ include:
106 disk/disk_stress_ng_.* certification-status=blocker
107 disk/disk_cpu_load_.* certification-status=non-blocker
108 networking/predictable_names certification-status=non-blocker
109- mediacard/sd-preinserted certification-status=blocker
110+ mediacard/sd-preinserted-server certification-status=blocker
111 memory/info certification-status=blocker
112 memory/memory_stress_ng certification-status=blocker
113 optical/detect certification-status=non-blocker
114diff --git a/units/server-functional-16.04.pxu b/units/server-functional-16.04.pxu
115index 17a1fbc..2542a93 100644
116--- a/units/server-functional-16.04.pxu
117+++ b/units/server-functional-16.04.pxu
118@@ -28,7 +28,7 @@ include:
119 disk/disk_stress_ng_.* certification-status=blocker
120 disk/disk_cpu_load_.* certification-status=non-blocker
121 networking/predictable_names certification-status=non-blocker
122- mediacard/sd-preinserted certification-status=blocker
123+ mediacard/sd-preinserted-server certification-status=blocker
124 memory/info certification-status=blocker
125 optical/detect certification-status=non-blocker
126 optical/read-automated_.* certification-status=non-blocker
127@@ -39,8 +39,8 @@ include:
128 virtualization/verify_lxd certification-status=non-blocker
129 virtualization/kvm_check_vm certification-status=blocker
130 info/kvm_output certification-status=non-blocker
131- miscellanea/oops certification-status=non-blocker
132- miscellanea/oops_results.log certification-status=non-blocker
133+ miscellanea/oops certification-status=non-blocker
134+ miscellanea/oops_results.log certification-status=non-blocker
135 miscellanea/olog certification-status=blocker
136 miscellanea/olog_results.log
137 miscellanea/klog certification-status=blocker
138diff --git a/units/server-functional-18.04.pxu b/units/server-functional-18.04.pxu
139index 4503738..e28376e 100644
140--- a/units/server-functional-18.04.pxu
141+++ b/units/server-functional-18.04.pxu
142@@ -28,7 +28,7 @@ include:
143 disk/disk_stress_ng_.* certification-status=blocker
144 disk/disk_cpu_load_.* certification-status=non-blocker
145 networking/predictable_names certification-status=non-blocker
146- mediacard/sd-preinserted certification-status=blocker
147+ mediacard/sd-preinserted-server certification-status=blocker
148 memory/info certification-status=blocker
149 optical/detect certification-status=non-blocker
150 optical/read-automated_.* certification-status=non-blocker
151diff --git a/units/server-regression-full.pxu b/units/server-regression-full.pxu
152index fb71c9e..f80aa5e 100644
153--- a/units/server-regression-full.pxu
154+++ b/units/server-regression-full.pxu
155@@ -28,7 +28,7 @@ include:
156 disk/disk_stress_ng_.* certification-status=blocker
157 disk/disk_cpu_load_.* certification-status=non-blocker
158 networking/predictable_names certification-status=non-blocker
159- mediacard/sd-preinserted certification-status=blocker
160+ mediacard/sd-preinserted-server certification-status=blocker
161 memory/info certification-status=blocker
162 memory/memory_stress_ng certification-status=blocker
163 optical/detect certification-status=non-blocker
164diff --git a/units/server-soc-cert-16.04.pxu b/units/server-soc-cert-16.04.pxu
165index 31d20e5..6bfb5f9 100644
166--- a/units/server-soc-cert-16.04.pxu
167+++ b/units/server-soc-cert-16.04.pxu
168@@ -27,7 +27,7 @@ include:
169 disk/disk_stress_ng_.* certification-status=blocker
170 disk/disk_cpu_load_.* certification-status=non-blocker
171 networking/predictable_names certification-status=non-blocker
172- mediacard/sd-preinserted certification-status=blocker
173+ mediacard/sd-preinserted-server certification-status=blocker
174 memory/info certification-status=blocker
175 memory/memory_stress_ng certification-status=blocker
176 power-management/rtc certification-status=blocker
177@@ -38,8 +38,8 @@ include:
178 virtualization/verify_lxd certification-status=non-blocker
179 virtualization/kvm_check_vm certification-status=blocker
180 info/kvm_output certification-status=non-blocker
181- miscellanea/oops certification-status=non-blocker
182- miscellanea/oops_results.log certification-status=non-blocker
183+ miscellanea/oops certification-status=non-blocker
184+ miscellanea/oops_results.log certification-status=non-blocker
185 miscellanea/olog certification-status=blocker
186 miscellanea/olog_results.log
187 miscellanea/klog certification-status=blocker
188diff --git a/units/server-soc-cert-18.04.pxu b/units/server-soc-cert-18.04.pxu
189index d27e0d7..fdbf8aa 100644
190--- a/units/server-soc-cert-18.04.pxu
191+++ b/units/server-soc-cert-18.04.pxu
192@@ -27,7 +27,7 @@ include:
193 disk/disk_stress_ng_.* certification-status=blocker
194 disk/disk_cpu_load_.* certification-status=non-blocker
195 networking/predictable_names certification-status=non-blocker
196- mediacard/sd-preinserted certification-status=blocker
197+ mediacard/sd-preinserted-server certification-status=blocker
198 memory/info certification-status=blocker
199 memory/memory_stress_ng certification-status=blocker
200 power-management/rtc certification-status=blocker
201diff --git a/units/storage-only.pxu b/units/storage-only.pxu
202index 34056d5..ec955c7 100644
203--- a/units/storage-only.pxu
204+++ b/units/storage-only.pxu
205@@ -21,7 +21,7 @@ include:
206 disk/storage_device_.* certification-status=blocker
207 disk/disk_stress_ng_.* certification-status=blocker
208 disk/disk_cpu_load_.* certification-status=non-blocker
209- mediacard/sd-preinserted certification-status=blocker
210+ mediacard/sd-preinserted-server certification-status=blocker
211 miscellanea/oops certification-status=non-blocker
212 miscellanea/oops_results.log certification-status=non-blocker
213 miscellanea/olog certification-status=blocker
214diff --git a/units/virtual-machine-full-16.04.pxu b/units/virtual-machine-full-16.04.pxu
215index e5875d6..643ba7c 100644
216--- a/units/virtual-machine-full-16.04.pxu
217+++ b/units/virtual-machine-full-16.04.pxu
218@@ -32,8 +32,8 @@ include:
219 memory/memory_stress_ng certification-status=blocker
220 power-management/rtc certification-status=blocker
221 stress/cpu_stress_ng_test certification-status=blocker
222- miscellanea/oops certification-status=non-blocker
223- miscellanea/oops_results.log certification-status=non-blocker
224+ miscellanea/oops certification-status=non-blocker
225+ miscellanea/oops_results.log certification-status=non-blocker
226 miscellanea/olog certification-status=blocker
227 miscellanea/olog_results.log
228 miscellanea/klog certification-status=blocker

Subscribers

People subscribed via source and target branches