Merge ~jocave/plainbox-provider-certification-client:cert-odm-server-test-plans into plainbox-provider-certification-client:master

[Jonathan Cave]

Create test plans for Ubuntu Server images by taking the existing Ubuntu Core test plans and excluding any Core specific OS tests.

The filters in the odm-certification launcher already accept these plans so they will be available immediately on release.

[Jonathan Cave (jocave)]

self-approve

review: Approve

diff --git a/units/client-cert-odm-server-18-04.pxu b/units/client-cert-odm-server-18-04.pxu
index 18cd146..680851b 100644
--- a/units/client-cert-odm-server-18-04.pxu
+++ b/units/client-cert-odm-server-18-04.pxu
@@ -1,9 +1,81 @@
-# id: client-cert-odm-server-18-04
-# _name: ODM Client Certification for Server 18.04
-# unit: test plan
-# _description:
-#  This test plan is intended for use by ODMs in their own facilities as part of
-#  the ODM Certification programme. This test plan should be used when certifying
-#  Server images.
-
-# Use client-cert-odm-desktop-18-04 unless reason to specialise is found
\ No newline at end of file
+id: client-cert-odm-server-18-04
+_name: ODM Client Certification for Server 18.04
+unit: test plan
+_description:
+ This test plan is intended for use by ODMs in their own facilities as part of
+ the ODM Certification programme. This test plan should be used when certifying
+ Server images.
+include:
+mandatory_include:
+    com.canonical.plainbox::manifest
+    executable
+    dmi
+    dmi_attachment
+    dpkg
+    interface
+    lsb
+    lspci_attachment
+    lsusb_attachment
+    meminfo
+    package
+    rtc
+    sleep
+    snap
+    sysfs_attachment
+    udev_attachment
+    udev_json
+    uname
+    connections
+    model_assertion
+    serial_assertion
+    net_if_management_attachment
+bootstrap_include:
+    bootloader
+    cpuinfo
+    device
+    net_if_management
+nested_part:
+    self-full
+    audio-manual
+    bluetooth-full
+    camera-full
+    led-manual
+    mediacard-full
+    rtc-full
+    serial-full
+    usb-c-full
+    usb-full
+    usb3-full
+    watchdog-full
+    wwan-full
+    com.intel.ipdt::ipdt-plan
+    cpu-automated
+    disk-automated
+    ethernet-automated
+    i2c-full
+    memory-automated
+    networking-automated
+    snappy-snap-automated
+    wireless-automated
+    wireless-wifi-master-mode-auto
+    tpm2.0_3.0.4
+    suspend-tp
+    after-suspend-audio-manual
+    after-suspend-bluetooth-full
+    after-suspend-ethernet-full
+    after-suspend-wireless-automated
+    after-suspend-wwan-full
+    warm-boot-stress-test
+    cold-boot-stress-test
+exclude:
+    com.intel.ipdt::ipdt/PCH-.*
+    usb-c/c-to-a-adapter.*
+    mediacard/mmc-.*
+    mediacard/cf-.*
+    mediacard/sdxc-.*
+    mediacard/ms-.*
+    mediacard/msp-.*
+    mediacard/xd-.*
+    rtc/battery
+    ubuntucore/os-.*
+    snappy/os-.*
diff --git a/units/client-cert-odm-server-20-04.pxu b/units/client-cert-odm-server-20-04.pxu
index 729eec1..daa9856 100644
--- a/units/client-cert-odm-server-20-04.pxu
+++ b/units/client-cert-odm-server-20-04.pxu
@@ -1,9 +1,81 @@
-# id: client-cert-odm-server-20-04
-# _name: ODM Client Certification for Server 20.04
-# unit: test plan
-# _description:
-#  This test plan is intended for use by ODMs in their own facilities as part of
-#  the ODM Certification programme. This test plan should be used when certifying
-#  Server images.
-
-# Use client-cert-odm-desktop-20-04 unless reason to specialise is found
\ No newline at end of file
+id: client-cert-odm-server-20-04
+_name: ODM Client Certification for Server 20.04
+unit: test plan
+_description:
+ This test plan is intended for use by ODMs in their own facilities as part of
+ the ODM Certification programme. This test plan should be used when certifying
+ Server images.
+include:
+mandatory_include:
+    com.canonical.plainbox::manifest
+    executable
+    dmi
+    dmi_attachment
+    dpkg
+    interface
+    lsb
+    lspci_attachment
+    lsusb_attachment
+    meminfo
+    package
+    rtc
+    sleep
+    snap
+    sysfs_attachment
+    udev_attachment
+    udev_json
+    uname
+    connections
+    model_assertion
+    serial_assertion
+    net_if_management_attachment
+bootstrap_include:
+    bootloader
+    cpuinfo
+    device
+    net_if_management
+nested_part:
+    self-full
+    audio-manual
+    bluetooth-full
+    camera-full
+    led-manual
+    mediacard-full
+    rtc-full
+    serial-full
+    usb-c-full
+    usb-full
+    usb3-full
+    watchdog-full
+    wwan-full
+    com.intel.ipdt::ipdt-plan
+    cpu-automated
+    disk-automated
+    ethernet-automated
+    i2c-full
+    memory-automated
+    networking-automated
+    snappy-snap-automated
+    wireless-automated
+    wireless-wifi-master-mode-auto
+    tpm2.0_4.1.1-automated
+    suspend-tp
+    after-suspend-audio-manual
+    after-suspend-bluetooth-full
+    after-suspend-ethernet-full
+    after-suspend-wireless-automated
+    after-suspend-wwan-full
+    warm-boot-stress-test
+    cold-boot-stress-test
+exclude:
+    com.intel.ipdt::ipdt/PCH-.*
+    usb-c/c-to-a-adapter.*
+    mediacard/mmc-.*
+    mediacard/cf-.*
+    mediacard/sdxc-.*
+    mediacard/ms-.*
+    mediacard/msp-.*
+    mediacard/xd-.*
+    rtc/battery
+    ubuntucore/os-.*
+    snappy/os-.*