Merge ~bladernr/plainbox-provider-certification-server:1812684-convert-info-to-nested-part into plainbox-provider-certification-server:master
- Git
- lp:~bladernr/plainbox-provider-certification-server
- 1812684-convert-info-to-nested-part
- Merge into master
Proposed by
Jeff Lane
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Sylvain Pineau | ||||
| Approved revision: | d21433caefcbdaa240202fb15707823bd04b0cf5 | ||||
| Merged at revision: | 1bf60ccb5bc81fa84109265fb245be4dc0ad9871 | ||||
| Proposed branch: | ~bladernr/plainbox-provider-certification-server:1812684-convert-info-to-nested-part | ||||
| Merge into: | plainbox-provider-certification-server:master | ||||
| Diff against target: |
808 lines (+21/-514) 21 files modified
units/firmware-tests.pxu (+1/-24) units/memory-only.pxu (+1/-25) units/network-only-14.04.pxu (+1/-24) units/network-only-16.04.pxu (+1/-24) units/network-only-18.04.pxu (+1/-24) units/server-full-14.04.pxu (+1/-25) units/server-full-16.04.pxu (+1/-25) units/server-full-18.04.pxu (+1/-25) units/server-functional-14.04.pxu (+1/-25) units/server-functional-16.04.pxu (+1/-25) units/server-functional-18.04.pxu (+1/-25) units/server-soc-cert-14.04.pxu (+1/-23) units/server-soc-cert-16.04.pxu (+1/-23) units/server-soc-cert-18.04.pxu (+1/-23) units/storage-only.pxu (+1/-24) units/stress-only.pxu (+1/-25) units/usb-only.pxu (+1/-25) units/virtual-machine-full-14.04.pxu (+1/-25) units/virtual-machine-full-16.04.pxu (+1/-25) units/virtual-machine-full-18.04.pxu (+1/-25) units/virtualization-only.pxu (+1/-25) |
||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sylvain Pineau (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Removed the individual info/attachment jobs in all server test plans.
Added nested info/attachment job in all server test plans.
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/firmware-tests.pxu b/units/firmware-tests.pxu |
| 2 | index 6515fb5..f9694cc 100644 |
| 3 | --- a/units/firmware-tests.pxu |
| 4 | +++ b/units/firmware-tests.pxu |
| 5 | @@ -7,32 +7,9 @@ _description: |
| 6 | whitelist is meant to provide the hardware vendor with information on |
| 7 | their system firmware. |
| 8 | nested_part: |
| 9 | + com.canonical.certification::server-info-attachment-automated |
| 10 | com.canonical.certification::server-firmware |
| 11 | com.canonical.certification::server-miscellaneous |
| 12 | -mandatory_include: |
| 13 | - # Meta-job to include required resources, please don't remove |
| 14 | - config_file_attachment |
| 15 | - cpuinfo_attachment |
| 16 | - dkms_info_attachment |
| 17 | - dmesg_attachment |
| 18 | - dmi_attachment |
| 19 | - dmidecode_attachment |
| 20 | - efi_attachment |
| 21 | - lspci_attachment |
| 22 | - lshw_attachment |
| 23 | - lsusb_attachment |
| 24 | - lsblk_attachment |
| 25 | - meminfo_attachment |
| 26 | - modprobe_attachment |
| 27 | - modinfo_attachment |
| 28 | - modules_attachment |
| 29 | - sysctl_attachment |
| 30 | - sysfs_attachment |
| 31 | - udev_attachment |
| 32 | - udev-summary_attachment |
| 33 | - lsmod_attachment |
| 34 | - info/disk_partitions |
| 35 | - kernel_cmdline_attachment |
| 36 | include: |
| 37 | miscellanea/ipmi_test |
| 38 | miscellanea/bmc_info |
| 39 | diff --git a/units/memory-only.pxu b/units/memory-only.pxu |
| 40 | index 24400b1..1741926 100644 |
| 41 | --- a/units/memory-only.pxu |
| 42 | +++ b/units/memory-only.pxu |
| 43 | @@ -6,33 +6,9 @@ _description: |
| 44 | is intended to be used as an easy way to retest or execute only the |
| 45 | memory related certification tests. |
| 46 | nested_part: |
| 47 | + com.canonical.certification::server-info-attachment-automated |
| 48 | com.canonical.certification::server-firmware |
| 49 | com.canonical.certification::server-miscellaneous |
| 50 | -mandatory_include: |
| 51 | - # Meta-job to include required resources, please don't remove |
| 52 | - config_file_attachment |
| 53 | - cpuinfo_attachment |
| 54 | - dkms_info_attachment |
| 55 | - dmesg_attachment |
| 56 | - dmi_attachment |
| 57 | - dmidecode_attachment |
| 58 | - efi_attachment |
| 59 | - lspci_attachment |
| 60 | - lshw_attachment |
| 61 | - lsusb_attachment |
| 62 | - lsblk_attachment |
| 63 | - meminfo_attachment |
| 64 | - modprobe_attachment |
| 65 | - modinfo_attachment |
| 66 | - modules_attachment |
| 67 | - sysctl_attachment |
| 68 | - sysfs_attachment |
| 69 | - udev_attachment |
| 70 | - udev-summary_attachment |
| 71 | - lsmod_attachment |
| 72 | - info/disk_partitions |
| 73 | - info/network_devices |
| 74 | - kernel_cmdline_attachment |
| 75 | include: |
| 76 | memory/info certification-status=blocker |
| 77 | memory/memory_stress_ng certification-status=blocker |
| 78 | diff --git a/units/network-only-14.04.pxu b/units/network-only-14.04.pxu |
| 79 | index 3c05698..75cfd0b 100644 |
| 80 | --- a/units/network-only-14.04.pxu |
| 81 | +++ b/units/network-only-14.04.pxu |
| 82 | @@ -7,32 +7,9 @@ _description: |
| 83 | run at the direction of the Cert Team when re-testing of network devices is |
| 84 | requried. |
| 85 | nested_part: |
| 86 | + com.canonical.certification::server-info-attachment-automated |
| 87 | com.canonical.certification::server-firmware |
| 88 | com.canonical.certification::server-miscellaneous |
| 89 | -mandatory_include: |
| 90 | - # Meta-job to include required resources, please don't remove |
| 91 | - config_file_attachment |
| 92 | - cpuinfo_attachment |
| 93 | - dkms_info_attachment |
| 94 | - dmesg_attachment |
| 95 | - dmi_attachment |
| 96 | - dmidecode_attachment |
| 97 | - efi_attachment |
| 98 | - lspci_attachment |
| 99 | - lshw_attachment |
| 100 | - lsusb_attachment |
| 101 | - lsblk_attachment |
| 102 | - meminfo_attachment |
| 103 | - modprobe_attachment |
| 104 | - modinfo_attachment |
| 105 | - modules_attachment |
| 106 | - sysctl_attachment |
| 107 | - sysfs_attachment |
| 108 | - udev_attachment |
| 109 | - udev-summary_attachment |
| 110 | - lsmod_attachment |
| 111 | - info/network_devices |
| 112 | - kernel_cmdline_attachment |
| 113 | include: |
| 114 | ethernet/detect |
| 115 | ethernet/info_automated |
| 116 | diff --git a/units/network-only-16.04.pxu b/units/network-only-16.04.pxu |
| 117 | index 982a9df..ec1ba84 100644 |
| 118 | --- a/units/network-only-16.04.pxu |
| 119 | +++ b/units/network-only-16.04.pxu |
| 120 | @@ -7,32 +7,9 @@ _description: |
| 121 | run at the direction of the Cert Team when re-testing of network devices is |
| 122 | requried. |
| 123 | nested_part: |
| 124 | + com.canonical.certification::server-info-attachment-automated |
| 125 | com.canonical.certification::server-firmware |
| 126 | com.canonical.certification::server-miscellaneous |
| 127 | -mandatory_include: |
| 128 | - # Meta-job to include required resources, please don't remove |
| 129 | - config_file_attachment |
| 130 | - cpuinfo_attachment |
| 131 | - dkms_info_attachment |
| 132 | - dmesg_attachment |
| 133 | - dmi_attachment |
| 134 | - dmidecode_attachment |
| 135 | - efi_attachment |
| 136 | - lspci_attachment |
| 137 | - lshw_attachment |
| 138 | - lsusb_attachment |
| 139 | - lsblk_attachment |
| 140 | - meminfo_attachment |
| 141 | - modprobe_attachment |
| 142 | - modinfo_attachment |
| 143 | - modules_attachment |
| 144 | - sysctl_attachment |
| 145 | - sysfs_attachment |
| 146 | - udev_attachment |
| 147 | - udev-summary_attachment |
| 148 | - lsmod_attachment |
| 149 | - info/network_devices |
| 150 | - kernel_cmdline_attachment |
| 151 | include: |
| 152 | networking/predictable_names certification-status=non-blocker |
| 153 | ethernet/detect |
| 154 | diff --git a/units/network-only-18.04.pxu b/units/network-only-18.04.pxu |
| 155 | index 5a5873a..8d5c713 100644 |
| 156 | --- a/units/network-only-18.04.pxu |
| 157 | +++ b/units/network-only-18.04.pxu |
| 158 | @@ -7,32 +7,9 @@ _description: |
| 159 | run at the direction of the Cert Team when re-testing of network devices is |
| 160 | requried. |
| 161 | nested_part: |
| 162 | + com.canonical.certification::server-info-attachment-automated |
| 163 | com.canonical.certification::server-firmware |
| 164 | com.canonical.certification::server-miscellaneous |
| 165 | -mandatory_include: |
| 166 | - # Meta-job to include required resources, please don't remove |
| 167 | - config_file_attachment |
| 168 | - cpuinfo_attachment |
| 169 | - dkms_info_attachment |
| 170 | - dmesg_attachment |
| 171 | - dmi_attachment |
| 172 | - dmidecode_attachment |
| 173 | - efi_attachment |
| 174 | - lspci_attachment |
| 175 | - lshw_attachment |
| 176 | - lsusb_attachment |
| 177 | - lsblk_attachment |
| 178 | - meminfo_attachment |
| 179 | - modprobe_attachment |
| 180 | - modinfo_attachment |
| 181 | - modules_attachment |
| 182 | - sysctl_attachment |
| 183 | - sysfs_attachment |
| 184 | - udev_attachment |
| 185 | - udev-summary_attachment |
| 186 | - lsmod_attachment |
| 187 | - info/network_devices |
| 188 | - kernel_cmdline_attachment |
| 189 | include: |
| 190 | networking/predictable_names certification-status=non-blocker |
| 191 | ethernet/detect |
| 192 | diff --git a/units/server-full-14.04.pxu b/units/server-full-14.04.pxu |
| 193 | index 5356822..a55d572 100644 |
| 194 | --- a/units/server-full-14.04.pxu |
| 195 | +++ b/units/server-full-14.04.pxu |
| 196 | @@ -7,33 +7,9 @@ _description: |
| 197 | Please use this whitelist for the Ubuntu Certification self-testing |
| 198 | programme. |
| 199 | nested_part: |
| 200 | + com.canonical.certification::server-info-attachment-automated |
| 201 | com.canonical.certification::server-firmware |
| 202 | com.canonical.certification::server-miscellaneous |
| 203 | -mandatory_include: |
| 204 | - # Meta-job to include required resources, please don't remove |
| 205 | - config_file_attachment |
| 206 | - cpuinfo_attachment |
| 207 | - dkms_info_attachment |
| 208 | - dmesg_attachment |
| 209 | - dmi_attachment |
| 210 | - dmidecode_attachment |
| 211 | - efi_attachment |
| 212 | - lspci_attachment |
| 213 | - lshw_attachment |
| 214 | - lsusb_attachment |
| 215 | - lsblk_attachment |
| 216 | - meminfo_attachment |
| 217 | - modprobe_attachment |
| 218 | - modinfo_attachment |
| 219 | - modules_attachment |
| 220 | - sysctl_attachment |
| 221 | - sysfs_attachment |
| 222 | - udev_attachment |
| 223 | - udev-summary_attachment |
| 224 | - lsmod_attachment |
| 225 | - info/disk_partitions |
| 226 | - info/network_devices |
| 227 | - kernel_cmdline_attachment |
| 228 | include: |
| 229 | info/hdparm_.*.txt certification-status=non-blocker |
| 230 | miscellanea/fwts_test certification-status=non-blocker |
| 231 | diff --git a/units/server-full-16.04.pxu b/units/server-full-16.04.pxu |
| 232 | index 8547dba..ab5f131 100644 |
| 233 | --- a/units/server-full-16.04.pxu |
| 234 | +++ b/units/server-full-16.04.pxu |
| 235 | @@ -7,33 +7,9 @@ _description: |
| 236 | Please use this whitelist for the Ubuntu Certification self-testing |
| 237 | programme. |
| 238 | nested_part: |
| 239 | + com.canonical.certification::server-info-attachment-automated |
| 240 | com.canonical.certification::server-firmware |
| 241 | com.canonical.certification::server-miscellaneous |
| 242 | -mandatory_include: |
| 243 | - # Meta-job to include required resources, please don't remove |
| 244 | - config_file_attachment |
| 245 | - cpuinfo_attachment |
| 246 | - dkms_info_attachment |
| 247 | - dmesg_attachment |
| 248 | - dmi_attachment |
| 249 | - dmidecode_attachment |
| 250 | - efi_attachment |
| 251 | - lspci_attachment |
| 252 | - lshw_attachment |
| 253 | - lsusb_attachment |
| 254 | - lsblk_attachment |
| 255 | - meminfo_attachment |
| 256 | - modprobe_attachment |
| 257 | - modinfo_attachment |
| 258 | - modules_attachment |
| 259 | - sysctl_attachment |
| 260 | - sysfs_attachment |
| 261 | - udev_attachment |
| 262 | - udev-summary_attachment |
| 263 | - lsmod_attachment |
| 264 | - info/disk_partitions |
| 265 | - info/network_devices |
| 266 | - kernel_cmdline_attachment |
| 267 | include: |
| 268 | info/hdparm_.*.txt certification-status=non-blocker |
| 269 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 270 | diff --git a/units/server-full-18.04.pxu b/units/server-full-18.04.pxu |
| 271 | index f7273c7..b4b8712 100644 |
| 272 | --- a/units/server-full-18.04.pxu |
| 273 | +++ b/units/server-full-18.04.pxu |
| 274 | @@ -7,33 +7,9 @@ _description: |
| 275 | Please use this whitelist for the Ubuntu Certification self-testing |
| 276 | programme. |
| 277 | nested_part: |
| 278 | + com.canonical.certification::server-info-attachment-automated |
| 279 | com.canonical.certification::server-firmware |
| 280 | com.canonical.certification::server-miscellaneous |
| 281 | -mandatory_include: |
| 282 | - # Meta-job to include required resources, please don't remove |
| 283 | - config_file_attachment |
| 284 | - cpuinfo_attachment |
| 285 | - dkms_info_attachment |
| 286 | - dmesg_attachment |
| 287 | - dmi_attachment |
| 288 | - dmidecode_attachment |
| 289 | - efi_attachment |
| 290 | - lspci_attachment |
| 291 | - lshw_attachment |
| 292 | - lsusb_attachment |
| 293 | - lsblk_attachment |
| 294 | - meminfo_attachment |
| 295 | - modprobe_attachment |
| 296 | - modinfo_attachment |
| 297 | - modules_attachment |
| 298 | - sysctl_attachment |
| 299 | - sysfs_attachment |
| 300 | - udev_attachment |
| 301 | - udev-summary_attachment |
| 302 | - lsmod_attachment |
| 303 | - info/disk_partitions |
| 304 | - info/network_devices |
| 305 | - kernel_cmdline_attachment |
| 306 | include: |
| 307 | info/hdparm_.*.txt certification-status=non-blocker |
| 308 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 309 | diff --git a/units/server-functional-14.04.pxu b/units/server-functional-14.04.pxu |
| 310 | index 11b2015..1f47890 100644 |
| 311 | --- a/units/server-functional-14.04.pxu |
| 312 | +++ b/units/server-functional-14.04.pxu |
| 313 | @@ -7,33 +7,9 @@ _description: |
| 314 | This test plan runs all server certification tests except for the really |
| 315 | demanding or lengthy ones. |
| 316 | nested_part: |
| 317 | + com.canonical.certification::server-info-attachment-automated |
| 318 | com.canonical.certification::server-firmware |
| 319 | com.canonical.certification::server-miscellaneous |
| 320 | -mandatory_include: |
| 321 | - # Meta-job to include required resources, please don't remove |
| 322 | - config_file_attachment |
| 323 | - cpuinfo_attachment |
| 324 | - dkms_info_attachment |
| 325 | - dmesg_attachment |
| 326 | - dmi_attachment |
| 327 | - dmidecode_attachment |
| 328 | - efi_attachment |
| 329 | - lspci_attachment |
| 330 | - lshw_attachment |
| 331 | - lsusb_attachment |
| 332 | - lsblk_attachment |
| 333 | - meminfo_attachment |
| 334 | - modprobe_attachment |
| 335 | - modinfo_attachment |
| 336 | - modules_attachment |
| 337 | - sysctl_attachment |
| 338 | - sysfs_attachment |
| 339 | - udev_attachment |
| 340 | - udev-summary_attachment |
| 341 | - lsmod_attachment |
| 342 | - info/disk_partitions |
| 343 | - info/network_devices |
| 344 | - kernel_cmdline_attachment |
| 345 | include: |
| 346 | info/hdparm_.*.txt certification-status=non-blocker |
| 347 | miscellanea/fwts_test certification-status=non-blocker |
| 348 | diff --git a/units/server-functional-16.04.pxu b/units/server-functional-16.04.pxu |
| 349 | index 8545df0..11f5fb4 100644 |
| 350 | --- a/units/server-functional-16.04.pxu |
| 351 | +++ b/units/server-functional-16.04.pxu |
| 352 | @@ -7,33 +7,9 @@ _description: |
| 353 | This test plan runs all server certification tests except for the really |
| 354 | demanding or lengthy ones. |
| 355 | nested_part: |
| 356 | + com.canonical.certification::server-info-attachment-automated |
| 357 | com.canonical.certification::server-firmware |
| 358 | com.canonical.certification::server-miscellaneous |
| 359 | -mandatory_include: |
| 360 | - # Meta-job to include required resources, please don't remove |
| 361 | - config_file_attachment |
| 362 | - cpuinfo_attachment |
| 363 | - dkms_info_attachment |
| 364 | - dmesg_attachment |
| 365 | - dmi_attachment |
| 366 | - dmidecode_attachment |
| 367 | - efi_attachment |
| 368 | - lspci_attachment |
| 369 | - lshw_attachment |
| 370 | - lsusb_attachment |
| 371 | - lsblk_attachment |
| 372 | - meminfo_attachment |
| 373 | - modprobe_attachment |
| 374 | - modinfo_attachment |
| 375 | - modules_attachment |
| 376 | - sysctl_attachment |
| 377 | - sysfs_attachment |
| 378 | - udev_attachment |
| 379 | - udev-summary_attachment |
| 380 | - lsmod_attachment |
| 381 | - info/disk_partitions |
| 382 | - info/network_devices |
| 383 | - kernel_cmdline_attachment |
| 384 | include: |
| 385 | info/hdparm_.*.txt certification-status=non-blocker |
| 386 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 387 | diff --git a/units/server-functional-18.04.pxu b/units/server-functional-18.04.pxu |
| 388 | index 941bc22..92e1409 100644 |
| 389 | --- a/units/server-functional-18.04.pxu |
| 390 | +++ b/units/server-functional-18.04.pxu |
| 391 | @@ -7,33 +7,9 @@ _description: |
| 392 | This test plan runs all server certification tests except for the really |
| 393 | demanding or lengthy ones. |
| 394 | nested_part: |
| 395 | + com.canonical.certification::server-info-attachment-automated |
| 396 | com.canonical.certification::server-firmware |
| 397 | com.canonical.certification::server-miscellaneous |
| 398 | -mandatory_include: |
| 399 | - # Meta-job to include required resources, please don't remove |
| 400 | - config_file_attachment |
| 401 | - cpuinfo_attachment |
| 402 | - dkms_info_attachment |
| 403 | - dmesg_attachment |
| 404 | - dmi_attachment |
| 405 | - dmidecode_attachment |
| 406 | - efi_attachment |
| 407 | - lspci_attachment |
| 408 | - lshw_attachment |
| 409 | - lsusb_attachment |
| 410 | - lsblk_attachment |
| 411 | - meminfo_attachment |
| 412 | - modprobe_attachment |
| 413 | - modinfo_attachment |
| 414 | - modules_attachment |
| 415 | - sysctl_attachment |
| 416 | - sysfs_attachment |
| 417 | - udev_attachment |
| 418 | - udev-summary_attachment |
| 419 | - lsmod_attachment |
| 420 | - info/disk_partitions |
| 421 | - info/network_devices |
| 422 | - kernel_cmdline_attachment |
| 423 | include: |
| 424 | info/hdparm_.*.txt certification-status=non-blocker |
| 425 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 426 | diff --git a/units/server-soc-cert-14.04.pxu b/units/server-soc-cert-14.04.pxu |
| 427 | index 7ba3c4b..e3f10b3 100644 |
| 428 | --- a/units/server-soc-cert-14.04.pxu |
| 429 | +++ b/units/server-soc-cert-14.04.pxu |
| 430 | @@ -6,31 +6,9 @@ _description: |
| 431 | contained here should work in any test lab envrionement. Please use this |
| 432 | whitelist for the Ubuntu Certification self-testing programme. |
| 433 | nested_part: |
| 434 | + com.canonical.certification::server-info-attachment-automated |
| 435 | com.canonical.certification::server-firmware |
| 436 | com.canonical.certification::server-miscellaneous |
| 437 | -mandatory_include: |
| 438 | - # Meta-job to include required resources, please don't remove |
| 439 | - config_file_attachment |
| 440 | - cpuinfo_attachment |
| 441 | - dkms_info_attachment |
| 442 | - dmesg_attachment |
| 443 | - efi_attachment |
| 444 | - lspci_attachment |
| 445 | - lshw_attachment |
| 446 | - lsusb_attachment |
| 447 | - lsblk_attachment |
| 448 | - meminfo_attachment |
| 449 | - modprobe_attachment |
| 450 | - modinfo_attachment |
| 451 | - modules_attachment |
| 452 | - sysctl_attachment |
| 453 | - sysfs_attachment |
| 454 | - udev_attachment |
| 455 | - udev-summary_attachment |
| 456 | - lsmod_attachment |
| 457 | - info/disk_partitions |
| 458 | - info/network_devices |
| 459 | - kernel_cmdline_attachment |
| 460 | include: |
| 461 | info/hdparm_.*.txt certification-status=non-blocker |
| 462 | miscellanea/fwts_test certification-status=non-blocker |
| 463 | diff --git a/units/server-soc-cert-16.04.pxu b/units/server-soc-cert-16.04.pxu |
| 464 | index 13a7561..a8d3133 100644 |
| 465 | --- a/units/server-soc-cert-16.04.pxu |
| 466 | +++ b/units/server-soc-cert-16.04.pxu |
| 467 | @@ -6,31 +6,9 @@ _description: |
| 468 | contained here should work in any test lab envrionement. Please use this |
| 469 | whitelist for the Ubuntu Certification self-testing programme. |
| 470 | nested_part: |
| 471 | + com.canonical.certification::server-info-attachment-automated |
| 472 | com.canonical.certification::server-firmware |
| 473 | com.canonical.certification::server-miscellaneous |
| 474 | -mandatory_include: |
| 475 | - # Meta-job to include required resources, please don't remove |
| 476 | - config_file_attachment |
| 477 | - cpuinfo_attachment |
| 478 | - dkms_info_attachment |
| 479 | - dmesg_attachment |
| 480 | - efi_attachment |
| 481 | - lspci_attachment |
| 482 | - lshw_attachment |
| 483 | - lsusb_attachment |
| 484 | - lsblk_attachment |
| 485 | - meminfo_attachment |
| 486 | - modprobe_attachment |
| 487 | - modinfo_attachment |
| 488 | - modules_attachment |
| 489 | - sysctl_attachment |
| 490 | - sysfs_attachment |
| 491 | - udev_attachment |
| 492 | - udev-summary_attachment |
| 493 | - lsmod_attachment |
| 494 | - info/disk_partitions |
| 495 | - info/network_devices |
| 496 | - kernel_cmdline_attachment |
| 497 | include: |
| 498 | info/hdparm_.*.txt certification-status=non-blocker |
| 499 | benchmarks/disk/hdparm-read_.* |
| 500 | diff --git a/units/server-soc-cert-18.04.pxu b/units/server-soc-cert-18.04.pxu |
| 501 | index 97fbdda..77a8510 100644 |
| 502 | --- a/units/server-soc-cert-18.04.pxu |
| 503 | +++ b/units/server-soc-cert-18.04.pxu |
| 504 | @@ -6,31 +6,9 @@ _description: |
| 505 | contained here should work in any test lab envrionement. Please use this |
| 506 | whitelist for the Ubuntu Certification self-testing programme. |
| 507 | nested_part: |
| 508 | + com.canonical.certification::server-info-attachment-automated |
| 509 | com.canonical.certification::server-firmware |
| 510 | com.canonical.certification::server-miscellaneous |
| 511 | -mandatory_include: |
| 512 | - # Meta-job to include required resources, please don't remove |
| 513 | - config_file_attachment |
| 514 | - cpuinfo_attachment |
| 515 | - dkms_info_attachment |
| 516 | - dmesg_attachment |
| 517 | - efi_attachment |
| 518 | - lspci_attachment |
| 519 | - lshw_attachment |
| 520 | - lsusb_attachment |
| 521 | - lsblk_attachment |
| 522 | - meminfo_attachment |
| 523 | - modprobe_attachment |
| 524 | - modinfo_attachment |
| 525 | - modules_attachment |
| 526 | - sysctl_attachment |
| 527 | - sysfs_attachment |
| 528 | - udev_attachment |
| 529 | - udev-summary_attachment |
| 530 | - lsmod_attachment |
| 531 | - info/disk_partitions |
| 532 | - info/network_devices |
| 533 | - kernel_cmdline_attachment |
| 534 | include: |
| 535 | info/hdparm_.*.txt certification-status=non-blocker |
| 536 | benchmarks/disk/hdparm-read_.* |
| 537 | diff --git a/units/storage-only.pxu b/units/storage-only.pxu |
| 538 | index ec93dba..34056d5 100644 |
| 539 | --- a/units/storage-only.pxu |
| 540 | +++ b/units/storage-only.pxu |
| 541 | @@ -7,32 +7,9 @@ _description: |
| 542 | run at the direction of the Cert Team when re-testing of storage devices is |
| 543 | required. |
| 544 | nested_part: |
| 545 | + com.canonical.certification::server-info-attachment-automated |
| 546 | com.canonical.certification::server-firmware |
| 547 | com.canonical.certification::server-miscellaneous |
| 548 | -mandatory_include: |
| 549 | - # Meta-job to include required resources, please don't remove |
| 550 | - config_file_attachment |
| 551 | - cpuinfo_attachment |
| 552 | - dkms_info_attachment |
| 553 | - dmesg_attachment |
| 554 | - dmi_attachment |
| 555 | - dmidecode_attachment |
| 556 | - efi_attachment |
| 557 | - lspci_attachment |
| 558 | - lshw_attachment |
| 559 | - lsusb_attachment |
| 560 | - lsblk_attachment |
| 561 | - meminfo_attachment |
| 562 | - modprobe_attachment |
| 563 | - modinfo_attachment |
| 564 | - modules_attachment |
| 565 | - sysctl_attachment |
| 566 | - sysfs_attachment |
| 567 | - udev_attachment |
| 568 | - udev-summary_attachment |
| 569 | - lsmod_attachment |
| 570 | - info/disk_partitions |
| 571 | - kernel_cmdline_attachment |
| 572 | include: |
| 573 | info/hdparm_.*.txt certification-status=non-blocker |
| 574 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 575 | diff --git a/units/stress-only.pxu b/units/stress-only.pxu |
| 576 | index 029d6ca..36da1b0 100644 |
| 577 | --- a/units/stress-only.pxu |
| 578 | +++ b/units/stress-only.pxu |
| 579 | @@ -8,33 +8,9 @@ _description: |
| 580 | test which will exercise the CPU, RAM and storage to very high |
| 581 | loading. |
| 582 | nested_part: |
| 583 | + com.canonical.certification::server-info-attachment-automated |
| 584 | com.canonical.certification::server-firmware |
| 585 | com.canonical.certification::server-miscellaneous |
| 586 | -mandatory_include: |
| 587 | - # Meta-job to include required resources, please don't remove |
| 588 | - config_file_attachment |
| 589 | - cpuinfo_attachment |
| 590 | - dkms_info_attachment |
| 591 | - dmesg_attachment |
| 592 | - dmi_attachment |
| 593 | - dmidecode_attachment |
| 594 | - efi_attachment |
| 595 | - lspci_attachment |
| 596 | - lshw_attachment |
| 597 | - lsusb_attachment |
| 598 | - lsblk_attachment |
| 599 | - meminfo_attachment |
| 600 | - modprobe_attachment |
| 601 | - modinfo_attachment |
| 602 | - modules_attachment |
| 603 | - sysctl_attachment |
| 604 | - sysfs_attachment |
| 605 | - udev_attachment |
| 606 | - udev-summary_attachment |
| 607 | - lsmod_attachment |
| 608 | - info/disk_partitions |
| 609 | - info/network_devices |
| 610 | - kernel_cmdline_attachment |
| 611 | include: |
| 612 | stress/cpu_stress_ng_test certification-status=blocker |
| 613 | bootstrap_include: |
| 614 | diff --git a/units/usb-only.pxu b/units/usb-only.pxu |
| 615 | index d4866f1..9c61016 100644 |
| 616 | --- a/units/usb-only.pxu |
| 617 | +++ b/units/usb-only.pxu |
| 618 | @@ -7,33 +7,9 @@ _description: |
| 619 | run at the direction of the Cert Team when re-testing of USB devices is |
| 620 | requried. |
| 621 | nested_part: |
| 622 | + com.canonical.certification::server-info-attachment-automated |
| 623 | com.canonical.certification::server-firmware |
| 624 | com.canonical.certification::server-miscellaneous |
| 625 | -mandatory_include: |
| 626 | - # Meta-job to include required resources, please don't remove |
| 627 | - config_file_attachment |
| 628 | - cpuinfo_attachment |
| 629 | - dkms_info_attachment |
| 630 | - dmesg_attachment |
| 631 | - dmi_attachment |
| 632 | - dmidecode_attachment |
| 633 | - efi_attachment |
| 634 | - lspci_attachment |
| 635 | - lshw_attachment |
| 636 | - lsusb_attachment |
| 637 | - lsblk_attachment |
| 638 | - meminfo_attachment |
| 639 | - modprobe_attachment |
| 640 | - modinfo_attachment |
| 641 | - modules_attachment |
| 642 | - sysctl_attachment |
| 643 | - sysfs_attachment |
| 644 | - udev_attachment |
| 645 | - udev-summary_attachment |
| 646 | - lsmod_attachment |
| 647 | - miscellanea/boot_mode |
| 648 | - info/disk_partitions |
| 649 | - kernel_cmdline_attachment |
| 650 | include: |
| 651 | info/hdparm_.*.txt |
| 652 | usb/detect |
| 653 | diff --git a/units/virtual-machine-full-14.04.pxu b/units/virtual-machine-full-14.04.pxu |
| 654 | index 0ab0683..3a0bb36 100644 |
| 655 | --- a/units/virtual-machine-full-14.04.pxu |
| 656 | +++ b/units/virtual-machine-full-14.04.pxu |
| 657 | @@ -7,33 +7,9 @@ _description: |
| 658 | envrionement. Please use this whitelist for the Ubuntu Certification |
| 659 | self-testing programme. |
| 660 | nested_part: |
| 661 | + com.canonical.certification::server-info-attachment-automated |
| 662 | com.canonical.certification::server-firmware |
| 663 | com.canonical.certification::server-miscellaneous |
| 664 | -mandatory_include: |
| 665 | - # Meta-job to include required resources, please don't remove |
| 666 | - config_file_attachment |
| 667 | - cpuinfo_attachment |
| 668 | - dkms_info_attachment |
| 669 | - dmesg_attachment |
| 670 | - dmi_attachment |
| 671 | - dmidecode_attachment |
| 672 | - efi_attachment |
| 673 | - lspci_attachment |
| 674 | - lshw_attachment |
| 675 | - lsusb_attachment |
| 676 | - lsblk_attachment |
| 677 | - meminfo_attachment |
| 678 | - modprobe_attachment |
| 679 | - modinfo_attachment |
| 680 | - modules_attachment |
| 681 | - sysctl_attachment |
| 682 | - sysfs_attachment |
| 683 | - udev_attachment |
| 684 | - udev-summary_attachment |
| 685 | - lsmod_attachment |
| 686 | - info/disk_partitions |
| 687 | - info/network_devices |
| 688 | - kernel_cmdline_attachment |
| 689 | include: |
| 690 | info/hdparm_.*.txt certification-status=non-blocker |
| 691 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 692 | diff --git a/units/virtual-machine-full-16.04.pxu b/units/virtual-machine-full-16.04.pxu |
| 693 | index 79d0bcb..52b069d 100644 |
| 694 | --- a/units/virtual-machine-full-16.04.pxu |
| 695 | +++ b/units/virtual-machine-full-16.04.pxu |
| 696 | @@ -7,33 +7,9 @@ _description: |
| 697 | envrionement. Please use this whitelist for the Ubuntu Certification |
| 698 | self-testing programme. |
| 699 | nested_part: |
| 700 | + com.canonical.certification::server-info-attachment-automated |
| 701 | com.canonical.certification::server-firmware |
| 702 | com.canonical.certification::server-miscellaneous |
| 703 | -mandatory_include: |
| 704 | - # Meta-job to include required resources, please don't remove |
| 705 | - config_file_attachment |
| 706 | - cpuinfo_attachment |
| 707 | - dkms_info_attachment |
| 708 | - dmesg_attachment |
| 709 | - dmi_attachment |
| 710 | - dmidecode_attachment |
| 711 | - efi_attachment |
| 712 | - lspci_attachment |
| 713 | - lshw_attachment |
| 714 | - lsusb_attachment |
| 715 | - lsblk_attachment |
| 716 | - meminfo_attachment |
| 717 | - modprobe_attachment |
| 718 | - modinfo_attachment |
| 719 | - modules_attachment |
| 720 | - sysctl_attachment |
| 721 | - sysfs_attachment |
| 722 | - udev_attachment |
| 723 | - udev-summary_attachment |
| 724 | - lsmod_attachment |
| 725 | - info/disk_partitions |
| 726 | - info/network_devices |
| 727 | - kernel_cmdline_attachment |
| 728 | include: |
| 729 | info/hdparm_.*.txt certification-status=non-blocker |
| 730 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 731 | diff --git a/units/virtual-machine-full-18.04.pxu b/units/virtual-machine-full-18.04.pxu |
| 732 | index 7458ecc..8a65b59 100644 |
| 733 | --- a/units/virtual-machine-full-18.04.pxu |
| 734 | +++ b/units/virtual-machine-full-18.04.pxu |
| 735 | @@ -7,33 +7,9 @@ _description: |
| 736 | envrionement. Please use this whitelist for the Ubuntu Certification |
| 737 | self-testing programme. |
| 738 | nested_part: |
| 739 | + com.canonical.certification::server-info-attachment-automated |
| 740 | com.canonical.certification::server-firmware |
| 741 | com.canonical.certification::server-miscellaneous |
| 742 | -mandatory_include: |
| 743 | - # Meta-job to include required resources, please don't remove |
| 744 | - config_file_attachment |
| 745 | - cpuinfo_attachment |
| 746 | - dkms_info_attachment |
| 747 | - dmesg_attachment |
| 748 | - dmi_attachment |
| 749 | - dmidecode_attachment |
| 750 | - efi_attachment |
| 751 | - lspci_attachment |
| 752 | - lshw_attachment |
| 753 | - lsusb_attachment |
| 754 | - lsblk_attachment |
| 755 | - meminfo_attachment |
| 756 | - modprobe_attachment |
| 757 | - modinfo_attachment |
| 758 | - modules_attachment |
| 759 | - sysctl_attachment |
| 760 | - sysfs_attachment |
| 761 | - udev_attachment |
| 762 | - udev-summary_attachment |
| 763 | - lsmod_attachment |
| 764 | - info/disk_partitions |
| 765 | - info/network_devices |
| 766 | - kernel_cmdline_attachment |
| 767 | include: |
| 768 | info/hdparm_.*.txt certification-status=non-blocker |
| 769 | benchmarks/disk/hdparm-read_.* certification-status=blocker |
| 770 | diff --git a/units/virtualization-only.pxu b/units/virtualization-only.pxu |
| 771 | index bf44ece..fa61007 100644 |
| 772 | --- a/units/virtualization-only.pxu |
| 773 | +++ b/units/virtualization-only.pxu |
| 774 | @@ -7,33 +7,9 @@ _description: |
| 775 | and should only be run at the direction of the Cert Team when re-testing |
| 776 | of virtualization capabilites is requried. |
| 777 | nested_part: |
| 778 | + com.canonical.certification::server-info-attachment-automated |
| 779 | com.canonical.certification::server-firmware |
| 780 | com.canonical.certification::server-miscellaneous |
| 781 | -mandatory_include: |
| 782 | - # Meta-job to include required resources, please don't remove |
| 783 | - config_file_attachment |
| 784 | - cpuinfo_attachment |
| 785 | - dkms_info_attachment |
| 786 | - dmesg_attachment |
| 787 | - dmi_attachment |
| 788 | - dmidecode_attachment |
| 789 | - efi_attachment |
| 790 | - lspci_attachment |
| 791 | - lshw_attachment |
| 792 | - lsusb_attachment |
| 793 | - lsblk_attachment |
| 794 | - meminfo_attachment |
| 795 | - modprobe_attachment |
| 796 | - modinfo_attachment |
| 797 | - modules_attachment |
| 798 | - sysctl_attachment |
| 799 | - sysfs_attachment |
| 800 | - udev_attachment |
| 801 | - udev-summary_attachment |
| 802 | - lsmod_attachment |
| 803 | - info/disk_partitions |
| 804 | - info/network_devices |
| 805 | - kernel_cmdline_attachment |
| 806 | include: |
| 807 | info/hdparm_.*.txt certification-status=non-blocker |
| 808 | virtualization/verify_lxd certification-status=blocker |
LGTM