Merge ~bladernr/plainbox-provider-certification-server:1827266-fix-network-tests into plainbox-provider-certification-server:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Rod Smith
Approved revision: a7b5797aea1b2b5cd96a4384c7c596222ddd948f
Merged at revision: 1c254121aa97f3d80119da982554f9f492fb1a61
Proposed branch: ~bladernr/plainbox-provider-certification-server:1827266-fix-network-tests
Merge into: plainbox-provider-certification-server:master
Diff against target: 211 lines (+9/-45)
9 files modified
units/network-only-16.04.pxu (+1/-5)
units/server-full-16.04.pxu (+1/-5)
units/server-full-18.04.pxu (+1/-5)
units/server-functional-16.04.pxu (+1/-5)
units/server-functional-18.04.pxu (+1/-5)
units/server-soc-cert-16.04.pxu (+1/-5)
units/server-soc-cert-18.04.pxu (+1/-5)
units/virtual-machine-full-16.04.pxu (+1/-5)
units/virtual-machine-full-18.04.pxu (+1/-5)
Reviewer Review Type Date Requested Status
Rod Smith Approve
Review via email: mp+366784@code.launchpad.net

Description of the change

Updates testplans to use the embedded server-ethernet testplan to fix a bug where over-greedy wild cards are running both the normal and underspeed network device tests.

To post a comment you must log in.
Revision history for this message
Rod Smith (rodsmith) wrote :

I've tested this as far as checking the tests to be run using certify-advanced, and it looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/network-only-16.04.pxu b/units/network-only-16.04.pxu
2index ec1ba84..b4d676c 100644
3--- a/units/network-only-16.04.pxu
4+++ b/units/network-only-16.04.pxu
5@@ -10,13 +10,9 @@ nested_part:
6 com.canonical.certification::server-info-attachment-automated
7 com.canonical.certification::server-firmware
8 com.canonical.certification::server-miscellaneous
9+ com.canonical.certification::server-ethernet
10 include:
11 networking/predictable_names certification-status=non-blocker
12- ethernet/detect
13- ethernet/info_automated
14- ethernet/ethtool_info
15- ethernet/ethertool_check_.*
16- ethernet/multi_iperf3_nic_.*
17 miscellanea/oops certification-status=non-blocker
18 miscellanea/oops_results.log certification-status=non-blocker
19 miscellanea/olog certification-status=blocker
20diff --git a/units/server-full-16.04.pxu b/units/server-full-16.04.pxu
21index ab5f131..85db087 100644
22--- a/units/server-full-16.04.pxu
23+++ b/units/server-full-16.04.pxu
24@@ -10,6 +10,7 @@ nested_part:
25 com.canonical.certification::server-info-attachment-automated
26 com.canonical.certification::server-firmware
27 com.canonical.certification::server-miscellaneous
28+ com.canonical.certification::server-ethernet
29 include:
30 info/hdparm_.*.txt certification-status=non-blocker
31 benchmarks/disk/hdparm-read_.* certification-status=blocker
32@@ -27,11 +28,6 @@ include:
33 disk/disk_stress_ng_.* certification-status=blocker
34 disk/disk_cpu_load_.* certification-status=non-blocker
35 networking/predictable_names certification-status=non-blocker
36- ethernet/detect certification-status=non-blocker
37- ethernet/info_automated certification-status=non-blocker
38- ethernet/ethtool_info certification-status=non-blocker
39- ethernet/ethertool_check_.* certification-status=non-blocker
40- ethernet/multi_iperf3_nic_.* certification-status=blocker
41 mediacard/sd-preinserted certification-status=blocker
42 memory/info certification-status=blocker
43 memory/memory_stress_ng certification-status=blocker
44diff --git a/units/server-full-18.04.pxu b/units/server-full-18.04.pxu
45index b4b8712..67157a3 100644
46--- a/units/server-full-18.04.pxu
47+++ b/units/server-full-18.04.pxu
48@@ -10,6 +10,7 @@ nested_part:
49 com.canonical.certification::server-info-attachment-automated
50 com.canonical.certification::server-firmware
51 com.canonical.certification::server-miscellaneous
52+ com.canonical.certification::server-ethernet
53 include:
54 info/hdparm_.*.txt certification-status=non-blocker
55 benchmarks/disk/hdparm-read_.* certification-status=blocker
56@@ -27,11 +28,6 @@ include:
57 disk/disk_stress_ng_.* certification-status=blocker
58 disk/disk_cpu_load_.* certification-status=non-blocker
59 networking/predictable_names certification-status=non-blocker
60- ethernet/detect certification-status=non-blocker
61- ethernet/info_automated certification-status=non-blocker
62- ethernet/ethtool_info certification-status=non-blocker
63- ethernet/ethertool_check_.* certification-status=non-blocker
64- ethernet/multi_iperf3_nic_.* certification-status=blocker
65 mediacard/sd-preinserted certification-status=blocker
66 memory/info certification-status=blocker
67 memory/memory_stress_ng certification-status=blocker
68diff --git a/units/server-functional-16.04.pxu b/units/server-functional-16.04.pxu
69index 11f5fb4..17a1fbc 100644
70--- a/units/server-functional-16.04.pxu
71+++ b/units/server-functional-16.04.pxu
72@@ -10,6 +10,7 @@ nested_part:
73 com.canonical.certification::server-info-attachment-automated
74 com.canonical.certification::server-firmware
75 com.canonical.certification::server-miscellaneous
76+ com.canonical.certification::server-ethernet
77 include:
78 info/hdparm_.*.txt certification-status=non-blocker
79 benchmarks/disk/hdparm-read_.* certification-status=blocker
80@@ -27,11 +28,6 @@ include:
81 disk/disk_stress_ng_.* certification-status=blocker
82 disk/disk_cpu_load_.* certification-status=non-blocker
83 networking/predictable_names certification-status=non-blocker
84- ethernet/detect certification-status=non-blocker
85- ethernet/info_automated certification-status=non-blocker
86- ethernet/ethtool_info certification-status=non-blocker
87- ethernet/ethertool_check_.* certification-status=non-blocker
88- ethernet/multi_iperf3_nic_.* certification-status=blocker
89 mediacard/sd-preinserted certification-status=blocker
90 memory/info certification-status=blocker
91 optical/detect certification-status=non-blocker
92diff --git a/units/server-functional-18.04.pxu b/units/server-functional-18.04.pxu
93index 92e1409..4503738 100644
94--- a/units/server-functional-18.04.pxu
95+++ b/units/server-functional-18.04.pxu
96@@ -10,6 +10,7 @@ nested_part:
97 com.canonical.certification::server-info-attachment-automated
98 com.canonical.certification::server-firmware
99 com.canonical.certification::server-miscellaneous
100+ com.canonical.certification::server-ethernet
101 include:
102 info/hdparm_.*.txt certification-status=non-blocker
103 benchmarks/disk/hdparm-read_.* certification-status=blocker
104@@ -27,11 +28,6 @@ include:
105 disk/disk_stress_ng_.* certification-status=blocker
106 disk/disk_cpu_load_.* certification-status=non-blocker
107 networking/predictable_names certification-status=non-blocker
108- ethernet/detect certification-status=non-blocker
109- ethernet/info_automated certification-status=non-blocker
110- ethernet/ethtool_info certification-status=non-blocker
111- ethernet/ethertool_check_.* certification-status=non-blocker
112- ethernet/multi_iperf3_nic_.* certification-status=blocker
113 mediacard/sd-preinserted certification-status=blocker
114 memory/info certification-status=blocker
115 optical/detect certification-status=non-blocker
116diff --git a/units/server-soc-cert-16.04.pxu b/units/server-soc-cert-16.04.pxu
117index a8d3133..31d20e5 100644
118--- a/units/server-soc-cert-16.04.pxu
119+++ b/units/server-soc-cert-16.04.pxu
120@@ -9,6 +9,7 @@ nested_part:
121 com.canonical.certification::server-info-attachment-automated
122 com.canonical.certification::server-firmware
123 com.canonical.certification::server-miscellaneous
124+ com.canonical.certification::server-ethernet
125 include:
126 info/hdparm_.*.txt certification-status=non-blocker
127 benchmarks/disk/hdparm-read_.*
128@@ -26,11 +27,6 @@ include:
129 disk/disk_stress_ng_.* certification-status=blocker
130 disk/disk_cpu_load_.* certification-status=non-blocker
131 networking/predictable_names certification-status=non-blocker
132- ethernet/detect certification-status=non-blocker
133- ethernet/info_automated certification-status=non-blocker
134- ethernet/ethtool_info certification-status=non-blocker
135- ethernet/ethertool_check_.* certification-status=non-blocker
136- ethernet/multi_iperf3_nic_.* certification-status=blocker
137 mediacard/sd-preinserted certification-status=blocker
138 memory/info certification-status=blocker
139 memory/memory_stress_ng certification-status=blocker
140diff --git a/units/server-soc-cert-18.04.pxu b/units/server-soc-cert-18.04.pxu
141index 77a8510..d27e0d7 100644
142--- a/units/server-soc-cert-18.04.pxu
143+++ b/units/server-soc-cert-18.04.pxu
144@@ -9,6 +9,7 @@ nested_part:
145 com.canonical.certification::server-info-attachment-automated
146 com.canonical.certification::server-firmware
147 com.canonical.certification::server-miscellaneous
148+ com.canonical.certification::server-ethernet
149 include:
150 info/hdparm_.*.txt certification-status=non-blocker
151 benchmarks/disk/hdparm-read_.*
152@@ -26,11 +27,6 @@ include:
153 disk/disk_stress_ng_.* certification-status=blocker
154 disk/disk_cpu_load_.* certification-status=non-blocker
155 networking/predictable_names certification-status=non-blocker
156- ethernet/detect certification-status=non-blocker
157- ethernet/info_automated certification-status=non-blocker
158- ethernet/ethtool_info certification-status=non-blocker
159- ethernet/ethertool_check_.* certification-status=non-blocker
160- ethernet/multi_iperf3_nic_.* certification-status=blocker
161 mediacard/sd-preinserted certification-status=blocker
162 memory/info certification-status=blocker
163 memory/memory_stress_ng certification-status=blocker
164diff --git a/units/virtual-machine-full-16.04.pxu b/units/virtual-machine-full-16.04.pxu
165index 52b069d..e5875d6 100644
166--- a/units/virtual-machine-full-16.04.pxu
167+++ b/units/virtual-machine-full-16.04.pxu
168@@ -10,6 +10,7 @@ nested_part:
169 com.canonical.certification::server-info-attachment-automated
170 com.canonical.certification::server-firmware
171 com.canonical.certification::server-miscellaneous
172+ com.canonical.certification::server-ethernet
173 include:
174 info/hdparm_.*.txt certification-status=non-blocker
175 benchmarks/disk/hdparm-read_.* certification-status=blocker
176@@ -27,11 +28,6 @@ include:
177 disk/disk_stress_ng_.* certification-status=blocker
178 disk/disk_cpu_load_.* certification-status=non-blocker
179 networking/predictable_names certification-status=non-blocker
180- ethernet/detect certification-status=non-blocker
181- ethernet/info_automated certification-status=non-blocker
182- ethernet/ethtool_info certification-status=non-blocker
183- ethernet/ethertool_check_.* certification-status=non-blocker
184- ethernet/multi_iperf3_nic_.* certification-status=blocker
185 memory/info certification-status=blocker
186 memory/memory_stress_ng certification-status=blocker
187 power-management/rtc certification-status=blocker
188diff --git a/units/virtual-machine-full-18.04.pxu b/units/virtual-machine-full-18.04.pxu
189index 8a65b59..88d3952 100644
190--- a/units/virtual-machine-full-18.04.pxu
191+++ b/units/virtual-machine-full-18.04.pxu
192@@ -10,6 +10,7 @@ nested_part:
193 com.canonical.certification::server-info-attachment-automated
194 com.canonical.certification::server-firmware
195 com.canonical.certification::server-miscellaneous
196+ com.canonical.certification::server-ethernet
197 include:
198 info/hdparm_.*.txt certification-status=non-blocker
199 benchmarks/disk/hdparm-read_.* certification-status=blocker
200@@ -27,11 +28,6 @@ include:
201 disk/disk_stress_ng_.* certification-status=blocker
202 disk/disk_cpu_load_.* certification-status=non-blocker
203 networking/predictable_names certification-status=non-blocker
204- ethernet/detect certification-status=non-blocker
205- ethernet/info_automated certification-status=non-blocker
206- ethernet/ethtool_info certification-status=non-blocker
207- ethernet/ethertool_check_.* certification-status=non-blocker
208- ethernet/multi_iperf3_nic_.* certification-status=blocker
209 memory/info certification-status=blocker
210 memory/memory_stress_ng certification-status=blocker
211 power-management/rtc certification-status=blocker

Subscribers

People subscribed via source and target branches