Merge ~sylvain-pineau/plainbox-provider-certification-client:prep-new-22-test-plans into plainbox-provider-certification-client:master

[Sylvain Pineau]

In preparation for base core22 testing, add uc22 and 22.04 test plans to this provider (only copies of uc20/20.04 test plans at the moment).

Note: those new test plans are not the final version!

[Jonathan Cave (jocave)]

I think this should be ok as the new test plans should not show-up in cdts.odm-certification thanks to the filter used in the launcher. (I would prefer they are not offered until we are ready to have ODMs certify with 22).

I wonder if the _name field should be pre-fixed with [DRAFT] or something for now?

review: Approve

[Sylvain Pineau (sylvain-pineau)]

lemme add this DRAFT marker

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

"10.38.105.197"
"10.38.105.54"
"10.38.105.108"
[xenial] [13:32:04] starting container
Device project added to xenial-testing
[bionic] [13:32:22] starting container
[focal] [13:32:26] starting container
"10.38.105.54"
[xenial] [13:32:28] provisioning container
Device project added to bionic-testing
Device project added to focal-testing
"10.38.105.145"
[bionic] [13:32:44] provisioning container
"10.38.105.251"
[focal] [13:32:49] provisioning container
[xenial] [13:33:44] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-certification-client
[bionic] [13:34:09] Starting tests...
[bionic] Found a test script: ./requirements/container-tests-provider-certification-client
[xenial] [13:34:33] container-tests-provider-certification-client: FAIL
[xenial] output: https://paste.ubuntu.com/p/x7WmChZWxC/
[xenial] [13:34:35] Fixing file permissions in source directory
[xenial] [13:34:35] Destroying container
[bionic] [13:34:44] container-tests-provider-certification-client: FAIL
[bionic] output: https://paste.ubuntu.com/p/6JNmwTXxGg/
[bionic] [13:34:46] Fixing file permissions in source directory
[bionic] [13:34:46] Destroying container
[focal] [13:35:11] Starting tests...
[focal] Found a test script: ./requirements/container-tests-provider-certification-client
[focal] [13:35:41] container-tests-provider-certification-client: FAIL
[focal] output: https://paste.ubuntu.com/p/SZ8TKwfVQy/
[focal] [13:35:43] Fixing file permissions in source directory
[focal] [13:35:43] Destroying container

review: Needs Fixing

[Devices Certification Bot (ce-certification-qa)]

I tried to merge it but there are some problems. Typically you want to merge or rebase and try again.

review: Needs Fixing

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/units/client-cert-desktop-22-04.pxu b/units/client-cert-desktop-22-04.pxu
new file mode 100644
index 0000000..4ed2c0c
--- /dev/null
+++ b/units/client-cert-desktop-22-04.pxu
@@ -0,0 +1,157 @@
+id: client-cert-desktop-22-04
+_name: [DRAFT] Desktop Preload Certification Tests for 22.04
+unit: test plan
+_description:
+ This test plan is intended for use inside Canonical's test labs. It will be
+ used to certify Desktop devices on behalf of OEM customers as part of
+ commercial engagements.
+include:
+nested_part:
+    client-cert-desktop-22-04-manual
+    client-cert-desktop-22-04-automated
+    client-cert-desktop-22-04-stress
+
+
+id: client-cert-desktop-22-04-manual
+_name: [DRAFT] Desktop Preload Certification Tests for 22.04 (Manual Tests)
+unit: test plan
+_description:
+ Includes tests that require input from an operator to complete.
+include:
+nested_part:
+    submission-cert-full
+    audio-cert-manual
+    bluetooth-cert-manual
+    camera-cert-manual
+    thunderbolt-cert-manual
+    monitor-integrated-gpu-cert-manual
+    graphics-integrated-gpu-cert-manual
+    graphics-discrete-gpu-cert-manual
+    monitor-discrete-gpu-cert-manual
+    cpu-cert-manual
+    input-cert-manual
+    disk-cert-manual
+    misc-client-cert-manual
+    fingerprint-manual
+    keys-cert-manual
+    led-cert-manual
+    mediacard-cert-manual
+    memory-manual
+    mobilebroadband-cert-manual
+    ethernet-cert-manual
+    networking-cert-manual
+    optical-cert-manual
+    power-management-precheck-cert-manual
+    touchpad-cert-manual
+    touchscreen-cert-manual
+    usb-cert-manual
+    usb3-cert-manual
+    usb-c-cert-full # no manual only
+    wireless-cert-manual
+    # start of suspend related tests
+    # suspend point
+    # Test discrete card first, if present, since it's the one we will be using
+    # after coming back from suspend if the system has hybrid graphics.
+    after-suspend-graphics-discrete-gpu-cert-manual
+    after-suspend-monitor-discrete-gpu-cert-full
+    # Now we ask to switch to the integrated graphics card. This requires a
+    # restart of checkbox.
+    after-suspend-graphics-integrated-gpu-cert-manual
+    after-suspend-monitor-integrated-gpu-cert-full
+    suspend-key-led-oops-check-cert
+    after-suspend-audio-cert-full
+    after-suspend-camera-cert-full
+    after-suspend-input-cert-full
+    after-suspend-keys-cert-full
+    after-suspend-led-cert-full
+    after-suspend-mediacard-cert-full
+    after-suspend-optical-cert-full
+    after-suspend-touchpad-cert-full
+    after-suspend-touchscreen-cert-manual
+    after-suspend-usb-cert-full
+    after-suspend-usb3-cert-full
+    after-suspend-usb-c-cert-full
+    # after-suspend-wireless-cert-full # auto only
+    info-attachment-cert-manual
+exclude:
+    keys/hibernate
+
+
+id: client-cert-desktop-22-04-automated
+_name: [DRAFT] Desktop Preload Certification Tests for 22.04 (Automated Tests)
+unit: test plan
+_description: 
+ Includes tests that do not require operator input.
+include:
+    audio/alsa_record_playback_automated
+    recovery_info_attachment
+nested_part:
+    submission-cert-automated
+    info-attachment-cert-automated
+    audio-cert-automated
+    bluetooth-cert-automated
+    camera-cert-automated
+    thunderbolt-cert-automated
+    monitor-integrated-gpu-cert-automated
+    graphics-integrated-gpu-cert-automated
+    graphics-discrete-gpu-cert-automated
+    monitor-discrete-gpu-cert-automated
+    cpu-cert-automated
+    input-cert-automated
+    disk-cert-automated
+    misc-client-cert-automated
+    fingerprint-automated
+    keys-cert-automated
+    led-cert-automated
+    mediacard-cert-automated
+    mediacard-automated
+    memory-automated
+    mobilebroadband-cert-automated
+    ethernet-cert-automated
+    networking-cert-automated
+    optical-cert-automated
+    power-management-precheck-cert-automated
+    touchpad-cert-automated
+    touchscreen-cert-automated
+    usb-cert-automated
+    usb-automated
+    wireless-cert-automated
+    # start of suspend related tests
+    before-suspend-reference-cert-full
+    # suspend point
+    after-suspend-reference-cert-full
+    # Test discrete card first, if present, since it's the one we will be using
+    # after coming back from suspend if the system has hybrid graphics.
+    after-suspend-graphics-discrete-gpu-cert-automated
+    # after-suspend-monitor-discrete-gpu-cert-automated # not defined
+    # Now we ask to switch to the integrated graphics card.
+    after-suspend-graphics-integrated-gpu-cert-automated
+    # after-suspend-monitor-integrated-gpu-cert-automated # not defined
+    after-suspend-touchscreen-cert-automated
+    after-suspend-wireless-cert-automated
+    # The following tests should run BEFORE the automated tests. The reboot and
+    # power off tests will also give us a clean system to start the stress run
+    # with.
+    power-management-reboot-poweroff-cert-automated
+    tpm-cert-automated
+bootstrap_include:
+    device
+    graphics_card
+
+id: client-cert-desktop-22-04-stress
+_name: [DRAFT] Desktop Preload Certification Tests for 22.04 (Stress Tests)
+unit: test plan
+_description:
+ Includes tests that are long running device stress tests.
+include:
+nested_part:
+    submission-cert-automated
+    # The following tests are purely automated and/or lenghty stress tests.
+    # They have been moved to the end of the test run to improve the testing
+    # process.
+    stress-iperf3-automated
+    #stress-cert-full
+    stress-suspend-30-cycles-with-reboots-automated
+    stress-ng-cert-automated
+    stress-30-reboot-poweroff-automated
+    stress-pm-graph
diff --git a/units/client-cert-iot-server-22-04.pxu b/units/client-cert-iot-server-22-04.pxu
new file mode 100644
index 0000000..97c48c8
--- /dev/null
+++ b/units/client-cert-iot-server-22-04.pxu
@@ -0,0 +1,45 @@
+id: client-cert-iot-server-22-04
+_name: [DRAFT] IoT Client Certification for 22.04 classic images
+unit: test plan
+_description:
+  This is classic 22.04
+include:
+nested_part:
+  client-cert-iot-server-22-04-manual
+  client-cert-iot-server-22-04-automated
+
+
+id: client-cert-iot-server-22-04-manual
+_name: [DRAFT] IoT Client Certification for 22.04 classic images (Manual Tests)
+unit: test plan
+_description:
+  This is classic 22.04
+include:
+nested_part:
+  # until there is reason to diverge, nest these plans
+  client-cert-iot-ubuntucore-20-manual
+exclude:
+  ubuntucore/os-.*
+  snappy/os-.*
+
+
+id: client-cert-iot-server-22-04-automated
+_name: [DRAFT] IoT Client Certification for 22.04 classic images (Automated Tests)
+unit: test plan
+_description:
+  This is classic 22.04
+include:
+nested_part:
+  # until there is reason to diverge, nest these plans
+  client-cert-iot-ubuntucore-20-automated
+  ## snappy-snap-automated-lightweight ??
+
+
+id: client-cert-iot-server-22-04-stress
+_name: [DRAFT] IoT Client Certification for 22.04 classic images (Stress Tests)
+unit: test plan
+_description:
+  This is classic 22.04
+include:
+nested_part:
+  stress-full
diff --git a/units/client-cert-iot-ubuntucore-22.pxu b/units/client-cert-iot-ubuntucore-22.pxu
new file mode 100644
index 0000000..245e845
--- /dev/null
+++ b/units/client-cert-iot-ubuntucore-22.pxu
@@ -0,0 +1,179 @@
+id: client-cert-iot-ubuntucore-22
+_name: [DRAFT] IoT Client Certification for Ubuntu Core 22
+unit: test plan
+_description:
+  This is UC22
+include:
+nested_part:
+  client-cert-iot-ubuntucore-22-manual
+  client-cert-iot-ubuntucore-22-automated
+
+
+id: client-cert-iot-ubuntucore-22-manual
+_name: [DRAFT] IoT Client Certification for Ubuntu Core 22 (Manual Tests)
+unit: test plan
+_description:
+  This is UC22
+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
+  model_assertion
+  serial_assertion
+  parts_meta_info_attachment
+  info/buildstamp
+  info/systemd-analyze
+  system_info_json
+  net_if_management_attachment
+bootstrap_include:
+  bootloader
+  cpuinfo
+  device
+  interface
+  net_if_management
+nested_part:
+  self-manual
+  ubuntucore-manual
+  audio-manual
+  bluetooth-manual
+  camera-manual
+  cpu-manual
+  disk-manual
+  ethernet-manual
+  led-manual
+  mediacard-manual
+  memory-manual
+  monitor-manual
+  networking-manual
+  rtc-manual
+  serial-manual
+  snappy-snap-manual
+  socketcan-manual-remote
+  socketcan-manual-local
+  usb-manual
+  usb-c-manual
+  usb3-manual
+  thunderbolt-cert-manual
+  watchdog-manual
+  wireless-manual
+  wireless-wifi-master-mode-manual
+  wwan-manual
+  after-suspend-audio-manual
+  after-suspend-bluetooth-manual
+  after-suspend-ethernet-manual
+  after-suspend-monitor-manual
+  after-suspend-networking-manual
+  after-suspend-serial-manual
+  after-suspend-socketcan-manual-remote
+  after-suspend-socketcan-manual-local
+  after-suspend-usb-manual
+  after-suspend-usb-c-manual
+  after-suspend-usb3-manual
+  after-suspend-thunderbolt-cert-manual
+  after-suspend-wireless-manual
+  after-suspend-wireless-wifi-master-mode-manual
+  after-suspend-wwan-manual
+
+
+id: client-cert-iot-ubuntucore-22-automated
+_name: [DRAFT] IoT Client Certification for Ubuntu Core 22 (Automated Tests)
+unit: test plan
+_description:
+  This is UC22
+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
+  model_assertion
+  serial_assertion
+  parts_meta_info_attachment
+  info/buildstamp
+  info/systemd-analyze
+  system_info_json
+  net_if_management_attachment
+bootstrap_include:
+  bootloader
+  cpuinfo
+  device
+  interface
+  net_if_management
+nested_part:
+  self-automated
+  ubuntucore-automated
+  com.intel.ipdt::ipdt-plan
+  iot-fwts-automated
+  audio-automated
+  bluez-automated
+  camera-automated
+  cpu-automated
+  disk-automated
+  docker-automated
+  ethernet-automated
+  i2c-automated
+  gpio-automated
+  kernel-security-automated
+  kernel-snap-automated
+  location-automated
+  mediacard-automated
+  memory-automated
+  # monitor-automated
+  networking-automated
+  power-automated
+  serial-automated
+  snappy-snap-automated
+  socketcan-auto-local
+  socketcan-auto-remote
+  tpm-cert-automated
+  usb-automated
+  thunderbolt-cert-automated
+  watchdog-automated
+  wireless-automated
+  wireless-wifi-master-mode-auto
+  wwan-automated
+  after-suspend-audio-automated
+  after-suspend-bluez-automated
+  after-suspend-ethernet-automated
+  after-suspend-gpio-automated
+  after-suspend-location-automated
+  after-suspend-serial-automated
+  after-suspend-usb-automated
+  after-suspend-wireless-automated
+  after-suspend-wwan-automated
+
+
+id: client-cert-iot-ubuntucore-22-stress
+_name: [DRAFT] IoT Client Certification for Ubuntu Core 22 (Stress Tests)
+unit: test plan
+_description:
+  This is UC22
+include:
+nested_part:
+  stress-full
diff --git a/units/client-cert-odm-desktop-22-04.pxu b/units/client-cert-odm-desktop-22-04.pxu
new file mode 100644
index 0000000..fbe7904
--- /dev/null
+++ b/units/client-cert-odm-desktop-22-04.pxu
@@ -0,0 +1,218 @@
+id: client-cert-odm-desktop-22-04-manual
+_name: [DRAFT] ODM Client Certification for Desktop 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
+ Desktop images.
+include:
+nested_part:
+    submission-cert-full
+    audio-cert-manual
+    bluetooth-cert-manual
+    camera-cert-manual
+    edac-manual
+    thunderbolt-cert-manual
+    monitor-integrated-gpu-cert-manual
+    graphics-integrated-gpu-cert-manual
+    graphics-discrete-gpu-cert-manual
+    monitor-discrete-gpu-cert-manual
+    input-cert-manual
+    disk-cert-manual
+    keys-cert-manual
+    led-cert-manual
+    mediacard-cert-manual
+    mobilebroadband-cert-manual
+    ethernet-cert-manual
+    networking-cert-manual
+    optical-cert-manual
+    power-management-precheck-cert-manual
+    # touchpad-cert-manual
+    # touchscreen-cert-manual
+    usb-cert-manual
+    usb3-cert-manual
+    usb-c-cert-full # no manual only
+    usb-dwc3-manual
+    wireless-cert-manual
+    # start of suspend related tests
+    before-suspend-reference-cert-full
+    # suspend point
+    after-suspend-reference-cert-full
+    # Test discrete card first, if present, since it's the one we will be using
+    # after coming back from suspend if the system has hybrid graphics.
+    after-suspend-graphics-discrete-gpu-cert-manual
+    after-suspend-monitor-discrete-gpu-cert-full
+    # Now we ask to switch to the integrated graphics card. This requires a
+    # restart of checkbox.
+    after-suspend-graphics-integrated-gpu-cert-manual
+    after-suspend-monitor-integrated-gpu-cert-full
+    suspend-key-led-oops-check-cert
+    after-suspend-audio-cert-full # no-manual only
+    after-suspend-camera-cert-full # no-manual only
+    after-suspend-input-cert-full # no-manual only
+    after-suspend-keys-cert-full # no-manual only
+    after-suspend-led-cert-full # no-manual only
+    after-suspend-mediacard-cert-full # no-manual only
+    after-suspend-optical-cert-full # no-manual only
+    # after-suspend-touchpad-cert-manual
+    # after-suspend-touchscreen-cert-manual
+    after-suspend-usb-cert-full # no-manual only
+    after-suspend-usb3-cert-full # no-manual only
+    after-suspend-usb-c-cert-full # no manual only
+    # after-suspend-wireless-cert-full # auto only
+    info-attachment-cert-full
+exclude:
+    com.canonical.certification::keys/hibernate
+    com.canonical.certification::keys/lock-screen
+    com.canonical.certification::keys/brightness
+    com.canonical.certification::keys/media-control
+    com.canonical.certification::keys/mute
+    com.canonical.certification::keys/volume
+    com.canonical.certification::keys/video-out
+    com.canonical.certification::keys/wireless
+    com.canonical.certification::keys/keyboard-backlight
+    com.canonical.certification::keys/microphone-mute
+    com.canonical.certification::keys/fn-lock
+    com.canonical.certification::after-suspend-manual-keys/hibernate
+    com.canonical.certification::after-suspend-manual-keys/lock-screen
+    com.canonical.certification::after-suspend-manual-keys/brightness
+    com.canonical.certification::after-suspend-manual-keys/media-control
+    com.canonical.certification::after-suspend-manual-keys/mute
+    com.canonical.certification::after-suspend-manual-keys/volume
+    com.canonical.certification::after-suspend-manual-keys/video-out
+    com.canonical.certification::after-suspend-manual-keys/wireless
+    com.canonical.certification::after-suspend-manual-keys/keyboard-backlight
+    com.canonical.certification::after-suspend-manual-keys/microphone-mute
+    com.canonical.certification::after-suspend-manual-keys/fn-lock
+    com.canonical.certification::led/bluetooth
+    com.canonical.certification::led/wlan
+    com.canonical.certification::led/wlan-disabled
+    com.canonical.certification::led/fn
+    com.canonical.certification::led/mute
+    com.canonical.certification::led/microphone-mute
+    com.canonical.certification::suspend/led_after_suspend/bluetooth
+    com.canonical.certification::suspend/led_after_suspend/wlan
+    com.canonical.certification::suspend/led_after_suspend/wlan-disabled
+    com.canonical.certification::after-suspend-manual-led/fn
+    com.canonical.certification::after-suspend-manual-led/mute
+    com.canonical.certification::after-suspend-manual-led/microphone-mute
+
+id: client-cert-odm-desktop-22-04-automated
+_name: [DRAFT] ODM Client Certification for Desktop 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
+ Desktop images.
+include:
+nested_part:
+    submission-cert-full
+    audio-cert-automated
+    bluetooth-cert-automated
+    camera-cert-automated
+    edac-automated
+    thunderbolt-cert-automated
+    monitor-integrated-gpu-cert-automated
+    graphics-integrated-gpu-cert-automated
+    graphics-discrete-gpu-cert-automated
+    monitor-discrete-gpu-cert-automated
+    input-cert-automated
+    disk-cert-manual
+    keys-cert-automated
+    led-cert-automated
+    mediacard-cert-automated
+    mobilebroadband-cert-automated
+    ethernet-cert-automated
+    networking-cert-automated
+    optical-cert-automated
+    power-management-precheck-cert-automated
+    # touchpad-cert-automated
+    # touchscreen-cert-automated
+    usb-cert-automated
+    usb3-cert-automated
+    # usb-c-cert-automated # only usb-c-cert-full
+    usb-dwc3-automated
+    wireless-cert-automated
+    # start of suspend related tests
+    before-suspend-reference-cert-full
+    # suspend point
+    after-suspend-reference-cert-full
+    # Test discrete card first, if present, since it's the one we will be using
+    # after coming back from suspend if the system has hybrid graphics.
+    after-suspend-graphics-discrete-gpu-cert-automated
+    # after-suspend-monitor-discrete-gpu-cert-automated # not defined
+    # Now we ask to switch to the integrated graphics card. This requires a
+    # restart of checkbox.
+    after-suspend-graphics-integrated-gpu-cert-automated
+    # after-suspend-monitor-integrated-gpu-cert-automated # not defined
+    suspend-key-led-oops-check-cert
+    # after-suspend-audio-cert-automated
+    # after-suspend-camera-cert-automated
+    # after-suspend-input-cert-automated
+    # after-suspend-keys-cert-automated
+    # after-suspend-led-cert-automated
+    # after-suspend-mediacard-cert-automated
+    # after-suspend-optical-cert-automated
+    # after-suspend-touchpad-cert-automated
+    # after-suspend-touchscreen-cert-automated
+    # after-suspend-usb-cert-automated
+    # after-suspend-usb3-cert-automated
+    # after-suspend-usb-c-cert-automated # only usb-c-cert-full
+    after-suspend-wireless-cert-automated
+    # Automated Tests
+    # The following tests are purely automated and/or lenghty stress tests.
+    # They have been moved to the end of the test run to improve the testing
+    # process.
+    misc-client-cert-full
+    cpu-cert-automated
+    disk-cert-automated
+    stress-iperf3-automated
+    warm-boot-stress-test
+    cold-boot-stress-test
+    suspend-stress-test
+    stress-ng-cert-automated
+    tpm-cert-automated
+    info-attachment-cert-full
+exclude:
+    com.canonical.certification::keys/hibernate
+    com.canonical.certification::keys/lock-screen
+    com.canonical.certification::keys/brightness
+    com.canonical.certification::keys/media-control
+    com.canonical.certification::keys/mute
+    com.canonical.certification::keys/volume
+    com.canonical.certification::keys/video-out
+    com.canonical.certification::keys/wireless
+    com.canonical.certification::keys/keyboard-backlight
+    com.canonical.certification::keys/microphone-mute
+    com.canonical.certification::keys/fn-lock
+    com.canonical.certification::after-suspend-manual-keys/hibernate
+    com.canonical.certification::after-suspend-manual-keys/lock-screen
+    com.canonical.certification::after-suspend-manual-keys/brightness
+    com.canonical.certification::after-suspend-manual-keys/media-control
+    com.canonical.certification::after-suspend-manual-keys/mute
+    com.canonical.certification::after-suspend-manual-keys/volume
+    com.canonical.certification::after-suspend-manual-keys/video-out
+    com.canonical.certification::after-suspend-manual-keys/wireless
+    com.canonical.certification::after-suspend-manual-keys/keyboard-backlight
+    com.canonical.certification::after-suspend-manual-keys/microphone-mute
+    com.canonical.certification::after-suspend-manual-keys/fn-lock
+    com.canonical.certification::led/bluetooth
+    com.canonical.certification::led/wlan
+    com.canonical.certification::led/wlan-disabled
+    com.canonical.certification::led/fn
+    com.canonical.certification::led/mute
+    com.canonical.certification::led/microphone-mute
+    com.canonical.certification::suspend/led_after_suspend/bluetooth
+    com.canonical.certification::suspend/led_after_suspend/wlan
+    com.canonical.certification::suspend/led_after_suspend/wlan-disabled
+    com.canonical.certification::after-suspend-manual-led/fn
+    com.canonical.certification::after-suspend-manual-led/mute
+    com.canonical.certification::after-suspend-manual-led/microphone-mute
+
+id: client-cert-odm-desktop-22-04
+_name: [DRAFT] DONT USE - desktop-22-04 - placeholder to establish that total number of tests has not changed
+unit: test plan
+include:
+nested_part:
+    client-cert-odm-desktop-22-04-manual
+    client-cert-odm-desktop-22-04-automated
diff --git a/units/client-cert-odm-ubuntucore-22.pxu b/units/client-cert-odm-ubuntucore-22.pxu
new file mode 100644
index 0000000..b8d5b66
--- /dev/null
+++ b/units/client-cert-odm-ubuntucore-22.pxu
@@ -0,0 +1,158 @@
+id: client-cert-odm-ubuntucore-22-manual
+_name: [DRAFT] ODM Client Certification for Ubuntu Core 22 - (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
+ Ubuntu Core 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-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-ubuntucore-22-automated
+_name: [DRAFT] ODM Client Certification for Ubuntu Core 22 - (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
+ Ubuntu Core 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-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
+
+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