Merge ~sylvain-pineau/plainbox-provider-certification-client:nested_parts_16.04 into plainbox-provider-certification-client:master

[Sylvain Pineau]

Use nested parts defined in p-p-c to build the 16.04 certification client test plan.

This updated version includes the following additions matching what somerville project is using (all w/o a certification status):

+com.canonical.certification::audio/channels
+com.canonical.certification::audio/external-linein
+com.canonical.certification::audio/external-lineout
+com.canonical.certification::touchpad/basic

+com.canonical.certification::info/buildstamp

+com.canonical.certification::install/apt-get-gets-updates

+com.canonical.certification::led/battery-charged
+com.canonical.certification::led/battery-charging
+com.canonical.certification::led/battery-low
+com.canonical.certification::led/touchpad
+com.canonical.certification::suspend/led_after_suspend/battery-charged
+com.canonical.certification::suspend/led_after_suspend/battery-charging
+com.canonical.certification::suspend/led_after_suspend/battery-low
+com.canonical.certification::suspend/led_after_suspend/camera
+com.canonical.certification::suspend/led_after_suspend/caps-lock
+com.canonical.certification::suspend/led_after_suspend/power
+com.canonical.certification::suspend/led_after_suspend/touchpad

+com.canonical.certification::miscellanea/chvt

-com.canonical.certification::monitor/.*_rca_.*
-com.canonical.certification::monitor/.*_svideo_.*

[Sylvain Pineau (sylvain-pineau)]

Cleaned history (thanks Pierre) + after suspend touchpad tests (from https://code.launchpad.net/~pierre-equoy/plainbox-provider-certification-client/+git/plainbox-provider-certification-client/+merge/331260)

review: Needs Resubmitting

[Sylvain Pineau (sylvain-pineau)]

Diff was reviewed by Jerry last week, LGTM.

review: Approve

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

The merge was fine but running tests failed.

[trusty] creating pristine container
[trusty] Unable to create pristine container!
[trusty] stdout:
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Trying to destroy to reclaim possible resources
[xenial] creating pristine container
[xenial] Unable to create pristine container!
[xenial] stdout:
[xenial] NOTE: unable to execute tests, marked as failed
[xenial] Trying to destroy to reclaim possible resources

review: Needs Fixing

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

The merge was fine but running tests failed.

[trusty] creating pristine container
[trusty] Unable to create pristine container!
[trusty] stdout:
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Trying to destroy to reclaim possible resources
[xenial] creating pristine container
[xenial] Unable to create pristine container!
[xenial] stdout:
[xenial] NOTE: unable to execute tests, marked as failed
[xenial] Trying to destroy to reclaim possible resources

review: Needs Fixing

diff --git a/units/client-cert-16-04.pxu b/units/client-cert-16-04.pxu
index e7fd3ae..f210ca3 100644
--- a/units/client-cert-16-04.pxu
+++ b/units/client-cert-16-04.pxu
@@ -9,379 +9,60 @@ _description:
  properly in your test environment. To avoid false failures, please use the
  client-selftest test plan instead.
 include:
-    # Resource Jobs (Not used by templates jobs)
-    IEEE_80211
-    block_device
-    cdimage
-    cpuinfo
-    display
-    dmi
-    dpkg
-    efi
-    environment
-    lsb
-    meminfo
-    mobilebroadband
-    module
-    optical_drive_.*                                       certification-status=blocker
-    package
-    rtc
-    sleep
-    uname
-    usb
-    xinput
-    # END Resource Jobs
-    audio/alsa_info_collect
-    audio/alsa_info_attachment
-    audio/list_devices
-    audio/speaker-headphone-plug-detection                 certification-status=blocker
-    audio/microphone-plug-detection                        certification-status=blocker
-    audio/playback_headphones                              certification-status=blocker
-    audio/alsa_record_playback_external                    certification-status=blocker
-    audio/playback_auto                                    certification-status=blocker
-    audio/alsa_record_playback_internal                    certification-status=blocker
-    # See Monitor / Graphic test section for hybrid-graphic monitor audio tests
-    bluetooth/detect-output                                certification-status=blocker
-    bluetooth/audio-a2dp                                   certification-status=blocker
-    bluetooth/browse-files                                 certification-status=blocker
-    bluetooth/file-transfer                                certification-status=blocker
-    bluetooth/HID
-    bluetooth4/HOGP-mouse                                  certification-status=non-blocker
-    bluetooth4/HOGP-keyboard                               certification-status=non-blocker
-    camera/detect                                          certification-status=blocker
-    camera/still                                           certification-status=blocker
-    camera/display                                         certification-status=blocker
-    camera/multiple-resolution-images                      certification-status=blocker
-    cpu/cstates                                            certification-status=blocker
-    cpu/cstates_results.log
-    disk/detect                                            certification-status=blocker
-    esata/insert                                           certification-status=blocker
-    esata/storage-test                                     certification-status=blocker
-    esata/remove                                           certification-status=blocker
-    firewire/insert                                        certification-status=blocker
-    firewire/storage-test                                  certification-status=blocker
-    firewire/remove                                        certification-status=blocker
-    thunderbolt/insert                                     certification-status=blocker
-    thunderbolt/storage-test                               certification-status=blocker
-    thunderbolt/remove                                     certification-status=blocker
-    thunderbolt3/insert                                    certification-status=non-blocker
-    thunderbolt3/storage-test                              certification-status=non-blocker
-    thunderbolt3/remove                                    certification-status=non-blocker
-    monitor/1_powersaving_.*                               certification-status=blocker
-    monitor/1_dim_brightness_.*                            certification-status=blocker
-    monitor/1_displayport_.*                               certification-status=blocker
-    monitor/1_type-c_displayport_.*                        certification-status=non-blocker
-    audio/1_playback_displayport_.*                        certification-status=blocker
-    audio/1_playback_type-c_displayport_.*                 certification-status=non-blocker
-    monitor/1_dvi_.*                                       certification-status=blocker
-    monitor/1_hdmi_.*                                      certification-status=blocker
-    audio/1_playback_hdmi_.*                               certification-status=blocker
-    monitor/1_thunderbolt_.*                               certification-status=blocker
-    monitor/1_thunderbolt3_.*                              certification-status=non-blocker
-    audio/1_playback_thunderbolt_.*                        certification-status=blocker
-    audio/1_playback_thunderbolt3_.*                       certification-status=non-blocker
-    thunderbolt/daisy-chain                                certification-status=blocker
-    thunderbolt3/daisy-chain                               certification-status=non-blocker
-    monitor/1_rca_.*                                       certification-status=blocker
-    monitor/1_svideo_.*                                    certification-status=blocker
-    monitor/1_vga_.*                                       certification-status=blocker
-    monitor/1_multi-head_.*                                certification-status=blocker
-    # See Graphic Tests section for monitor test on second graphic card
-    graphics/xorg-version                                  certification-status=blocker
-    graphics/xorg-failsafe                                 certification-status=blocker
-    graphics/xorg-process                                  certification-status=blocker
-    graphics/VESA_drivers_not_in_use                       certification-status=blocker
-    graphics/1_maximum_resolution_.*                       certification-status=blocker
-    graphics/1_glxgears_.*                                 certification-status=blocker
-    graphics/1_driver_version_.*                           certification-status=blocker
-    graphics/1_compiz_check_.*                             certification-status=blocker
-    graphics/1_rotation_.*                                 certification-status=blocker
-    graphics/1_video_.*                                    certification-status=blocker
-    graphics/1_minimum_resolution_.*
-    graphics/1_cycle_resolution_.*                         certification-status=non-blocker
-    graphics/2_switch_card_.*_xenial                       certification-status=blocker
-    graphics/2_maximum_resolution_.*                       certification-status=blocker
-    graphics/2_valid_opengl_renderer_.*                    certification-status=blocker
-    graphics/2_glxgears_.*                                 certification-status=blocker
-    graphics/2_driver_version_.*                           certification-status=blocker
-    graphics/2_compiz_check_.*                             certification-status=blocker
-    graphics/2_rotation_.*                                 certification-status=blocker
-    graphics/2_video_.*                                    certification-status=blocker
-    graphics/2_minimum_resolution_.*
-    graphics/2_cycle_resolution_.*                         certification-status=non-blocker
-    monitor/2_powersaving_.*                               certification-status=blocker
-    monitor/2_dim_brightness_.*                            certification-status=blocker
-    monitor/2_displayport_.*                               certification-status=blocker
-    monitor/2_type-c_displayport_.*                        certification-status=non-blocker
-    audio/2_playback_displayport_.*                        certification-status=blocker
-    audio/2_playback_type-c_displayport_.*                 certification-status=non-blocker
-    monitor/2_dvi_.*                                       certification-status=blocker
-    monitor/2_hdmi_.*                                      certification-status=blocker
-    audio/2_playback_hdmi_.*                               certification-status=blocker
-    monitor/2_thunderbolt_.*                               certification-status=blocker
-    monitor/2_thunderbolt3_.*                              certification-status=non-blocker
-    audio/2_playback_thunderbolt_.*                        certification-status=blocker
-    audio/2_playback_thunderbolt3_.*                       certification-status=non-blocker
-    monitor/2_rca_.*                                       certification-status=blocker
-    monitor/2_svideo_.*                                    certification-status=blocker
-    monitor/2_vga_.*                                       certification-status=blocker
-    monitor/2_multi-head_.*                                certification-status=blocker
-    input/accelerometer                                    certification-status=non-blocker
-    input/pointing_.*                                      certification-status=blocker
-    input/clicking_.*                                      certification-status=blocker
-    input/keyboard                                         certification-status=blocker
-    disk/hdd-parking                                       certification-status=non-blocker
-    keys/lock-screen                                       certification-status=blocker
-    keys/super                                             certification-status=blocker
-    keys/battery-info                                      certification-status=blocker
-    keys/brightness                                        certification-status=blocker
-    keys/media-control                                     certification-status=blocker
-    keys/mute                                              certification-status=blocker
-    keys/volume                                            certification-status=blocker
-    keys/video-out                                         certification-status=blocker
-    keys/wireless                                          certification-status=blocker
-    keys/keyboard-backlight                                certification-status=blocker
-    keys/microphone-mute                                   certification-status=blocker
-    led/bluetooth                                          certification-status=non-blocker
-    led/camera                                             certification-status=blocker
-    led/caps-lock                                          certification-status=blocker
-    led/mute                                               certification-status=blocker
-    led/microphone-mute                                    certification-status=non-blocker
-    led/numeric-keypad                                     certification-status=blocker
-    led/power                                              certification-status=blocker
-    # NOTE: led/power-blink-suspend and led/suspend are used later in the
-    #       testplan just after a number of suspend tests.
-    # led/power-blink-suspend
-    # led/suspend
-    # NOTE: led/wireless is redundant given that we have led/wlan and
-    #       led/bluetooth already
-    # led/wireless
-    led/wlan                                               certification-status=non-blocker
-    led/wlan-disabled
-    mediacard/sd-insert                                    certification-status=blocker
-    mediacard/sd-storage                                   certification-status=blocker
-    mediacard/sd-remove                                    certification-status=blocker
-    mediacard/sdhc-insert                                  certification-status=blocker
-    mediacard/sdhc-storage                                 certification-status=blocker
-    mediacard/sdhc-remove                                  certification-status=blocker
-    miscellanea/oops                                       certification-status=blocker
-    miscellanea/oops_results.log
-    mobilebroadband/gsm_connection                         certification-status=non-blocker
-    mobilebroadband/cdma_connection                        certification-status=non-blocker
-    ethernet/detect                                        certification-status=blocker
-    networking/gateway_ping                                certification-status=blocker
-    networking/info.*                                      certification-status=blocker
-    networking/ntp                                         certification-status=blocker
-    optical/detect                                         certification-status=blocker
-    optical/read_.*                                        certification-status=blocker
-    optical/cdrom-write_.*                                 certification-status=blocker
-    optical/dvd-write_.*                                   certification-status=blocker
-    optical/bluray-read_.*                                 certification-status=blocker
-    optical/bluray-write_.*                                certification-status=blocker
-    # Laptop lid tests relocated to the S3-adv section as it will trigger S3 as well
-    power-management/rtc                                   certification-status=blocker
-    power-management/tickless_idle                         certification-status=blocker
-    power-management/fwts_wakealarm                        certification-status=blocker
-    power-management/fwts_wakealarm-log-attach
-    touchpad/detected-as-mouse                             certification-status=blocker
-    touchpad/palm-rejection                                certification-status=non-blocker
-    touchpad/continuous-move                               certification-status=blocker
-    touchpad/horizontal                                    certification-status=blocker
-    touchpad/vertical                                      certification-status=blocker
-    touchpad/singletouch-automated                         certification-status=blocker
-    touchpad/singletouch-selection                         certification-status=blocker
-    touchpad/drag-and-drop                                 certification-status=blocker
-    touchpad/multitouch-automated                          certification-status=blocker
-    touchpad/multitouch-manual                             certification-status=blocker
-    touchpad/multitouch-rightclick                         certification-status=blocker
-    touchpad/multitouch-horizontal                         certification-status=blocker
-    touchpad/multitouch-vertical                           certification-status=blocker
-    touchpad/multitouch-dash                               certification-status=non-blocker
-    touchscreen/drag-n-drop                                certification-status=blocker
-    touchscreen/multitouch-zoom                            certification-status=blocker
-    touchscreen/multitouch-rotate
-    touchscreen/3-touch-tap                                certification-status=blocker
-    touchscreen/4-touch-tap                                certification-status=blocker
-    touchscreen/multitouch-dash                            certification-status=non-blocker
-    usb/detect                                             certification-status=blocker
-    usb/HID                                                certification-status=blocker
-    usb/insert                                             certification-status=blocker
-    usb/storage-automated                                  certification-status=blocker
-    usb/remove                                             certification-status=blocker
-    usb3/insert                                            certification-status=blocker
-    usb3/storage-automated                                 certification-status=blocker
-    usb3/remove                                            certification-status=blocker
-    usb-c/c-to-a-adapter/hid                               certification-status=non-blocker
-    usb-c/c-to-a-adapter/insert                            certification-status=non-blocker
-    usb-c/c-to-a-adapter/storage-automated                 certification-status=non-blocker
-    usb-c/c-to-a-adapter/remove                            certification-status=non-blocker
-    usb-c/hid                                              certification-status=non-blocker
-    usb-c/insert                                           certification-status=non-blocker
-    usb-c/storage-automated                                certification-status=non-blocker
-    usb-c/remove                                           certification-status=non-blocker
-    wireless/wireless_scanning                             certification-status=blocker
-    wireless/wireless_connection_wpa_bg                    certification-status=blocker
-    wireless/wireless_connection_open_bg                   certification-status=blocker
-    wireless/wireless_connection_wpa_n                     certification-status=blocker
-    wireless/wireless_connection_open_n                    certification-status=blocker
-    wireless/wireless_connection_wpa_ac                    certification-status=blocker
-    wireless/wireless_connection_open_ac                   certification-status=blocker
-    suspend/network_before_suspend                         certification-status=blocker
-    suspend/audio_before_suspend                           certification-status=blocker
-    suspend/cpu_before_suspend                             certification-status=blocker
-    suspend/memory_before_suspend                          certification-status=blocker
-    suspend/bluetooth_obex_send_before_suspend             certification-status=blocker
-    suspend/bluetooth_obex_browse_before_suspend           certification-status=blocker
-    suspend/bluetooth_obex_get_before_suspend              certification-status=blocker
-    # Test card 2 first, if present, since it's the one we will be using
+nested_part:
+    submission-cert-full
+    audio-cert-full
+    bluetooth-cert-full
+    camera-cert-full
+    esata-cert-full
+    firewire-cert-full
+    thunderbolt-cert-full
+    monitor-integrated-gpu-cert-full
+    graphics-integrated-gpu-cert-full
+    graphics-discrete-gpu-cert-full
+    monitor-discrete-gpu-cert-full
+    input-cert-full
+    disk-cert-manual
+    keys-cert-full
+    led-cert-full
+    mediacard-cert-full
+    mobilebroadband-cert-full
+    networking-cert-full
+    optical-cert-full
+    power-management-precheck-cert
+    touchpad-cert-full
+    touchscreen-cert-full
+    usb-cert-full
+    usb3-cert-full
+    usb-c-cert-full
+    wireless-cert-full
+    before-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.
-    suspend/2_resolution_before_suspend_.*_xenial          certification-status=blocker
-    suspend/2_suspend_after_switch_to_card_.*_xenial       certification-status=blocker
-    suspend/2_suspend-time-check_.*_xenial                 certification-status=non-blocker
-    suspend/2_suspend-single-log-attach_.*_xenial
-    suspend/2_compiz_check_after_suspend_.*_xenial         certification-status=blocker
-    suspend/2_driver_version_after_suspend_.*_xenial       certification-status=blocker
-    suspend/2_resolution_after_suspend_.*_xenial           certification-status=blocker
-    suspend/2_display_after_suspend_.*_xenial              certification-status=blocker
-    suspend/2_glxgears_after_suspend_.*_xenial             certification-status=blocker
-    suspend/2_video_after_suspend_.*_xenial                certification-status=blocker
-    suspend/2_cycle_resolutions_after_suspend_.*_xenial    certification-status=non-blocker
-    suspend/2_xrandr_screens_after_suspend_.*.tar.gz_xenial
-    power-management/2_hibernate_advanced_.*               certification-status=non-blocker
-    power-management/2_hibernate-single-log-attach_.*
-    # Now we ask to switch to the first graphics card. This requires a restart
-    # of checkbox.
-    graphics/1_switch_card_.*_xenial                       certification-status=blocker
-    suspend/1_resolution_before_suspend_.*_xenial          certification-status=blocker
-    suspend/suspend_advanced                               certification-status=blocker
-    suspend/1_suspend-time-check_.*_xenial                 certification-status=non-blocker
-    suspend/1_suspend-single-log-attach_.*_xenial
-    power-management/lid                                   certification-status=blocker
-    power-management/lid_close                             certification-status=blocker
-    power-management/lid_open                              certification-status=blocker
-    suspend/1_compiz_check_after_suspend_.*_xenial         certification-status=blocker
-    suspend/1_driver_version_after_suspend_.*_xenial       certification-status=blocker
-    suspend/1_resolution_after_suspend_.*_xenial           certification-status=blocker
-    suspend/1_display_after_suspend_.*_xenial              certification-status=blocker
-    suspend/1_glxgears_after_suspend_.*_xenial             certification-status=blocker
-    suspend/1_video_after_suspend_.*_xenial                certification-status=blocker
-    suspend/1_cycle_resolutions_after_suspend_.*_xenial    certification-status=non-blocker
-    suspend/1_xrandr_screens_after_suspend.tar.gz_xenial
-    keys/sleep                                             certification-status=blocker
-    led/power-blink-suspend                                certification-status=blocker
-    led/suspend                                            certification-status=blocker
-    suspend/network_after_suspend                          certification-status=blocker
-    suspend/audio_after_suspend                            certification-status=blocker
-    suspend/cpu_after_suspend                              certification-status=blocker
-    suspend/memory_after_suspend                           certification-status=blocker
-    suspend/bluetooth_detect_after_suspend                 certification-status=blocker
-    suspend/bluetooth_obex_send_after_suspend              certification-status=blocker
-    suspend/bluetooth_obex_browse_after_suspend            certification-status=blocker
-    suspend/bluetooth_obex_get_after_suspend               certification-status=blocker
-    suspend/speaker-headphone-plug-detection-after-suspend certification-status=blocker
-    suspend/microphone-plug-detection-after-suspend        certification-status=blocker
-    suspend/playback_headphones-after-suspend              certification-status=blocker
-    suspend/alsa_record_playback_external-after-suspend    certification-status=blocker
-    camera/display_after_suspend                           certification-status=blocker
-    camera/still_after_suspend                             certification-status=blocker
-    suspend/pointing-after-suspend_.*                      certification-status=blocker
-    suspend/clicking-after-suspend_.*                      certification-status=blocker
-    suspend/sd-insert-after-suspend                        certification-status=blocker
-    suspend/sd-storage-after-suspend                       certification-status=blocker
-    suspend/sd-remove-after-suspend                        certification-status=blocker
-    suspend/sdhc-insert-after-suspend                      certification-status=blocker
-    suspend/sdhc-storage-after-suspend                     certification-status=blocker
-    suspend/sdhc-remove-after-suspend                      certification-status=blocker
-    suspend/usb_insert_after_suspend                       certification-status=blocker
-    suspend/usb_storage_automated_after_suspend            certification-status=blocker
-    suspend/usb_remove_after_suspend                       certification-status=blocker
-    suspend/usb3_insert_after_suspend                      certification-status=blocker
-    suspend/usb3_storage_automated_after_suspend           certification-status=blocker
-    suspend/usb3_remove_after_suspend                      certification-status=blocker
-    suspend/oops_after_suspend                             certification-status=blocker
-    suspend/oops_results_after_suspend.log
-    suspend/wireless_connection_after_suspend_wpa_bg       certification-status=blocker
-    suspend/wireless_connection_after_suspend_open_bg      certification-status=blocker
-    suspend/wireless_connection_after_suspend_wpa_n        certification-status=blocker
-    suspend/wireless_connection_after_suspend_open_n       certification-status=blocker
-    suspend/wireless_connection_after_suspend_wpa_ac       certification-status=blocker
-    suspend/wireless_connection_after_suspend_open_ac      certification-status=blocker
-    power-management/hibernate_advanced                    certification-status=non-blocker
-    power-management/hibernate-single-log-attach
-    keys/hibernate                                         certification-status=blocker
+    after-suspend-graphics-discrete-gpu-cert-full
+    after-suspend-graphics-integrated-gpu-cert-full
+    suspend-key-led-oops-check-cert
+    after-suspend-reference-cert-full
+    after-suspend-audio-cert-full
+    after-suspend-camera-cert-full
+    after-suspend-input-cert-full
+    after-suspend-led-cert-full
+    after-suspend-mediacard-cert-full
+    after-suspend-touchpad-cert-full
+    after-suspend-usb-cert-full
+    after-suspend-usb3-cert-full
+    after-suspend-wireless-cert-full
     # 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/poweroff                              certification-status=blocker
-    power-management/poweroff-log-attach
-    power-management/reboot                                certification-status=blocker
-    power-management/reboot-log-attach
+    power-management-reboot-poweroff-cert
     # 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.
-    firmware/fwts_desktop_diagnosis
-    firmware/fwts_desktop_diagnosis_hwe
-    firmware/fwts_desktop_diagnosis_results.log.gz
-    firmware/fwts_desktop_diagnosis_results_hwe.log.gz
-    firmware/fwts_wakealarm.*                              certification-status=blocker
-    firmware/fwts_uefirtvariable.*                         certification-status=blocker
-    firmware/no_ACPI_REV_interface
-    miscellanea/dmitest_client
-    benchmarks/disk/hdparm-read_.*
-    benchmarks/disk/hdparm-cache-read_.*
-    cpu/scaling_test                                       certification-status=blocker
-    cpu/scaling_test-log-attach
-    cpu/maxfreq_test                                       certification-status=blocker
-    cpu/maxfreq_test-log-attach
-    cpu/offlining_test                                     certification-status=blocker
-    cpu/topology                                           certification-status=blocker
-    cpu/clocktest
-    disk/stats_.*
-    disk/read_performance_.*                               certification-status=blocker
-    disk/storage_device_.*                                 certification-status=blocker
-    memory/info                                            certification-status=blocker
-    memory/check                                           certification-status=blocker
-    power-management/suspend_30_cycles                     certification-status=blocker
-    power-management/suspend-30-cycle-log-attach
-    power-management/suspend-30-cycles-time-check          certification-status=non-blocker
-    power-management/hibernate_30_cycles                   certification-status=non-blocker
-    power-management/hibernate-30-cycle-log-attach
-    stress/cpu_stress_test                                 certification-status=blocker
-    tpm2.0/.*                                              certification-status=non-blocker
-    #Info attachment jobs
-    codecs_attachment
-    cpuinfo_attachment
-    dmesg_attachment
-    dmi_attachment
-    dmidecode_attachment
-    efi_attachment
-    lspci_attachment
-    lspci_standard_config_attachment
-    lsusb_attachment
-    kernel_cmdline_attachment
-    meminfo_attachment
-    modinfo_attachment
-    modprobe_attachment
-    modules_attachment
-    sysctl_attachment
-    sysfs_attachment
-    udev_attachment
-    recovery_info_attachment
-    dell_bto_xml_attachment
-    lsmod_attachment
-    dkms_info_attachment
-    acpi_sleep_attachment
-    info/hdparm_.*.txt
-    installer_debug.gz
-    info/touchpad_driver
-    info/disk_partitions
-bootstrap_include:
-    device
-    fwts
-    graphics_card
-mandatory_include:
-    com.canonical.plainbox::collect-manifest
-    miscellanea/device_check
-    # Meta-job to include required resources, don't remove.
-    miscellanea/submission-resources
+    misc-client-cert-full
+    cpu-cert-full
+    disk-cert-automated
+    stress-cert-full
+    tpm2.0
+    info-attachment-cert-full
diff --git a/units/touchpad.pxu b/units/touchpad.pxu
index a3f362f..6cf44bb 100644
--- a/units/touchpad.pxu
+++ b/units/touchpad.pxu
@@ -5,84 +5,8 @@ _description:
  This test plan is used for customers and independent hardware vendors (IHV)
  to test and verify the behavior of touchpads on tested devices.
 include:
-    # Resource Jobs (Not used by templates jobs)
-    block_device
-    cdimage
-    cpuinfo
-    dmi
-    dpkg
-    efi
-    environment
-    lsb
-    meminfo
-    module
-    package
-    rtc
-    sleep
-    uname
-    usb
-    xinput
-    # END Resource Jobs
-    touchpad/basic                                         certification-status=blocker
-    touchpad/detected-as-mouse                             certification-status=blocker
-    touchpad/palm-rejection                                certification-status=non-blocker
-    touchpad/continuous-move                               certification-status=blocker
-    touchpad/horizontal                                    certification-status=blocker
-    touchpad/vertical                                      certification-status=blocker
-    touchpad/singletouch-automated                         certification-status=blocker
-    touchpad/singletouch-selection                         certification-status=blocker
-    touchpad/drag-and-drop                                 certification-status=blocker
-    touchpad/multitouch-automated                          certification-status=blocker
-    touchpad/multitouch-manual                             certification-status=blocker
-    touchpad/multitouch-rightclick                         certification-status=blocker
-    touchpad/multitouch-horizontal                         certification-status=blocker
-    touchpad/multitouch-vertical                           certification-status=blocker
-    touchpad/multitouch-dash                               certification-status=non-blocker
-    # Touchpad tests after suspend
-    touchpad/basic-after-suspend                           certification-status=blocker
-    touchpad/detected-as-mouse-after-suspend               certification-status=blocker
-    touchpad/palm-rejection-after-suspend                  certification-status=non-blocker
-    touchpad/continuous-move-after-suspend                 certification-status=blocker
-    touchpad/horizontal-after-suspend                      certification-status=blocker
-    touchpad/vertical-after-suspend                        certification-status=blocker
-    touchpad/singletouch-automated-after-suspend           certification-status=blocker
-    touchpad/singletouch-selection-after-suspend           certification-status=blocker
-    touchpad/drag-and-drop-after-suspend                   certification-status=blocker
-    touchpad/multitouch-automated-after-suspend            certification-status=blocker
-    touchpad/multitouch-manual-after-suspend               certification-status=blocker
-    touchpad/multitouch-rightclick-after-suspend           certification-status=blocker
-    touchpad/multitouch-horizontal-after-suspend           certification-status=blocker
-    touchpad/multitouch-vertical-after-suspend             certification-status=blocker
-    touchpad/multitouch-dash-after-suspend                 certification-status=non-blocker
-    #Info attachment jobs
-    codecs_attachment
-    cpuinfo_attachment
-    dmesg_attachment
-    dmi_attachment
-    dmidecode_attachment
-    efi_attachment
-    lspci_attachment
-    lspci_standard_config_attachment
-    lsusb_attachment
-    kernel_cmdline_attachment
-    meminfo_attachment
-    modinfo_attachment
-    modprobe_attachment
-    modules_attachment
-    sysctl_attachment
-    sysfs_attachment
-    udev_attachment
-    recovery_info_attachment
-    dell_bto_xml_attachment
-    lsmod_attachment
-    dkms_info_attachment
-    acpi_sleep_attachment
-    info/hdparm_.*.txt
-    installer_debug.gz
-    info/touchpad_driver
-    info/disk_partitions
-bootstrap_include:
-    device
-mandatory_include:
-    # Meta-job to include required resources, don't remove.
-    miscellanea/submission-resources
+nested_part:
+    submission-cert-full
+    touchpad-cert-full
+    after-suspend-touchpad-cert-full
+    info-attachment-cert-full