Merge ~jocave/plainbox-provider-certification-client:ensure-all-submission-jobs-run into plainbox-provider-certification-client:master

[Jonathan Cave]

Ensure that submission-cert-* nested plans are present in all top level plans for certification programmes. These are essential for gathering info include the BIOS version on which testing took place which is displayed in the final Cert.

[Sylvain Pineau (sylvain-pineau)]

LGTM

review: Approve

diff --git a/units/client-cert-iot-ubuntucore-16.pxu b/units/client-cert-iot-ubuntucore-16.pxu
index ce30baf..2dfb654 100644
--- a/units/client-cert-iot-ubuntucore-16.pxu
+++ b/units/client-cert-iot-ubuntucore-16.pxu
@@ -17,28 +17,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -46,6 +35,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-full
   self-manual
   audio-manual
   bluetooth-manual
@@ -94,28 +84,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -123,6 +102,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-automated
   self-automated
   com.intel.ipdt::ipdt-plan
   iot-fwts-automated
diff --git a/units/client-cert-iot-ubuntucore-18.pxu b/units/client-cert-iot-ubuntucore-18.pxu
index de5b962..65b0e1b 100644
--- a/units/client-cert-iot-ubuntucore-18.pxu
+++ b/units/client-cert-iot-ubuntucore-18.pxu
@@ -17,28 +17,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -46,6 +35,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-full
   self-manual
   audio-manual
   bluetooth-manual
@@ -96,28 +86,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -125,6 +104,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-automated
   self-automated
   com.intel.ipdt::ipdt-plan
   iot-fwts-automated
diff --git a/units/client-cert-iot-ubuntucore-20.pxu b/units/client-cert-iot-ubuntucore-20.pxu
index 8a432cb..34651c1 100644
--- a/units/client-cert-iot-ubuntucore-20.pxu
+++ b/units/client-cert-iot-ubuntucore-20.pxu
@@ -17,28 +17,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -46,6 +35,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-full
   self-manual
   ubuntucore-manual
   audio-manual
@@ -97,28 +87,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -126,6 +105,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-automated
   self-automated
   ubuntucore-automated
   com.intel.ipdt::ipdt-plan
diff --git a/units/client-cert-iot-ubuntucore-22.pxu b/units/client-cert-iot-ubuntucore-22.pxu
index 245e845..30cd6be 100644
--- a/units/client-cert-iot-ubuntucore-22.pxu
+++ b/units/client-cert-iot-ubuntucore-22.pxu
@@ -17,28 +17,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -46,6 +35,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-full
   self-manual
   ubuntucore-manual
   audio-manual
@@ -97,28 +87,17 @@ _description:
 include:
 mandatory_include:
   com.canonical.plainbox::manifest
-  alsa_resource
-  dmi
-  dmi_attachment
-  dmesg_attachment
-  dpkg
-  lsb
-  lspci_attachment
-  lsusb_attachment
-  meminfo
-  package
-  snap
-  sysfs_attachment
-  udev_attachment
-  udev_json
-  uname
+  executable
+  interface
+  connections
   model_assertion
   serial_assertion
-  parts_meta_info_attachment
-  info/buildstamp
-  info/systemd-analyze
-  system_info_json
   net_if_management_attachment
+  lspci_attachment
+  lsusb_attachment
+  rtc
+  sleep
+  parts_meta_info_attachment
 bootstrap_include:
   bootloader
   cpuinfo
@@ -126,6 +105,7 @@ bootstrap_include:
   interface
   net_if_management
 nested_part:
+  submission-cert-automated
   self-automated
   ubuntucore-automated
   com.intel.ipdt::ipdt-plan
diff --git a/units/client-cert-odm-server-18-04.pxu b/units/client-cert-odm-server-18-04.pxu
index bcf5b5c..e2139fe 100644
--- a/units/client-cert-odm-server-18-04.pxu
+++ b/units/client-cert-odm-server-18-04.pxu
@@ -9,32 +9,23 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-full
     self-manual
     audio-manual
     bluetooth-manual
@@ -77,32 +68,23 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-automated
     self-automated
     bluez-automated
     camera-automated
diff --git a/units/client-cert-odm-server-20-04.pxu b/units/client-cert-odm-server-20-04.pxu
index 0b5685d..6081225 100644
--- a/units/client-cert-odm-server-20-04.pxu
+++ b/units/client-cert-odm-server-20-04.pxu
@@ -9,32 +9,23 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-full
     self-manual
     audio-manual
     bluetooth-manual
@@ -78,32 +69,23 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-automated
     self-automated
     bluez-automated
     camera-automated
diff --git a/units/client-cert-odm-server-22-04.pxu b/units/client-cert-odm-server-22-04.pxu
new file mode 100644
index 0000000..91b232c
--- /dev/null
+++ b/units/client-cert-odm-server-22-04.pxu
@@ -0,0 +1,132 @@
+id: client-cert-odm-server-22-04-manual
+_name: [DRAFT] ODM Client Certification for Server 22.04 - (1/2) Manual tests
+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
+    interface
+    connections
+    model_assertion
+    serial_assertion
+    net_if_management_attachment
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
+bootstrap_include:
+    bootloader
+    cpuinfo
+    device
+    net_if_management
+nested_part:
+    submission-cert-full
+    self-manual
+    audio-manual
+    bluetooth-manual
+    camera-manual
+    edac-manual
+    led-manual
+    mediacard-manual
+    rtc-manual
+    serial-manual
+    usb-c-manual
+    usb-manual
+    usb3-manual
+    usb-dwc3-manual
+    thunderbolt-cert-manual
+    wwan-manual
+    i2c-manual
+    suspend-tp
+    after-suspend-audio-manual
+    after-suspend-bluetooth-manual
+    after-suspend-ethernet-manual
+    after-suspend-wwan-manual
+    after-suspend-thunderbolt-cert-manual
+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
+
+id: client-cert-odm-server-22-04-automated
+_name: [DRAFT] ODM Client Certification for Server 22.04 - (2/2) Automated tests
+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
+    interface
+    connections
+    model_assertion
+    serial_assertion
+    net_if_management_attachment
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
+bootstrap_include:
+    bootloader
+    cpuinfo
+    device
+    net_if_management
+nested_part:
+    submission-cert-automated
+    self-automated
+    bluez-automated
+    camera-automated
+    edac-automated
+    mediacard-automated
+    rtc-automated
+    serial-automated
+    usb-c-automated
+    usb-automated
+    usb3-automated
+    usb-dwc3-automated
+    thunderbolt-cert-automated
+    watchdog-automated
+    wwan-automated
+    com.intel.ipdt::ipdt-plan
+    cpu-automated
+    disk-automated
+    ethernet-automated
+    iot-cert-image-automated
+    i2c-automated
+    memory-automated
+    networking-automated
+    snappy-snap-automated
+    wireless-automated
+    wireless-wifi-master-mode-auto
+    tpm-cert-automated
+    suspend-tp
+    after-suspend-bluez-automated
+    after-suspend-ethernet-automated
+    after-suspend-wireless-automated
+    after-suspend-wwan-automated
+    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
diff --git a/units/client-cert-odm-ubuntucore-18.pxu b/units/client-cert-odm-ubuntucore-18.pxu
index 88a9add..c318336 100644
--- a/units/client-cert-odm-ubuntucore-18.pxu
+++ b/units/client-cert-odm-ubuntucore-18.pxu
@@ -9,32 +9,23 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-full
     self-manual
     audio-manual
     bluetooth-manual
@@ -77,32 +68,23 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-automated
     self-automated
     bluez-automated
     camera-automated
diff --git a/units/client-cert-odm-ubuntucore-20.pxu b/units/client-cert-odm-ubuntucore-20.pxu
index 2c2023f..0426d10 100644
--- a/units/client-cert-odm-ubuntucore-20.pxu
+++ b/units/client-cert-odm-ubuntucore-20.pxu
@@ -9,32 +9,22 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-full
     self-manual
     audio-manual
     bluetooth-manual
@@ -79,32 +69,22 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-automated
     self-automated
     bluez-automated
     camera-automated
diff --git a/units/client-cert-odm-ubuntucore-22.pxu b/units/client-cert-odm-ubuntucore-22.pxu
index b8d5b66..50f0dd2 100644
--- a/units/client-cert-odm-ubuntucore-22.pxu
+++ b/units/client-cert-odm-ubuntucore-22.pxu
@@ -9,32 +9,23 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
+    parts_meta_info_attachment
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-full
     self-manual
     audio-manual
     bluetooth-manual
@@ -79,32 +70,22 @@ 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
+    lspci_attachment
+    lsusb_attachment
+    rtc
+    sleep
 bootstrap_include:
     bootloader
     cpuinfo
     device
     net_if_management
 nested_part:
+    submission-cert-automated
     self-automated
     bluez-automated
     camera-automated
@@ -148,11 +129,3 @@ exclude:
     mediacard/msp-.*
     mediacard/xd-.*
     rtc/battery
-
-id: client-cert-odm-ubuntucore-22
-_name: [DRAFT] DONT USE - uc22 - placeholder to establish that total number of tests has not changed
-unit: test plan
-include:
-nested_part:
-    client-cert-odm-ubuntucore-22-manual
-    client-cert-odm-ubuntucore-22-automated