Update Somerville-cli & Whitelist

7 files changed, 294 insertions, 366 deletions

diff --git a/units/somerville-BIOS.pxu b/units/somerville-BIOS.pxu
index 8838c59..4d330f8 100644
--- a/units/somerville-BIOS.pxu
+++ b/units/somerville-BIOS.pxu
@@ -3,7 +3,7 @@ _name: Somerville BIOS Tests
 unit: test plan
 include:
 ## BIOS Whitelist for Dell projects
- ## Rev 1.1, 2015-10-01
+ ## Rev 1.2, 2016-03-29
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -20,7 +20,6 @@ include:
 2013.com.canonical.certification::meminfo
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
- 2013.com.canonical.certification::optical_drive
 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
@@ -29,7 +28,6 @@ include:
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
 2013.com.canonical.certification::resource
- # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
 somerville
@@ -39,10 +37,9 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
- 2013.com.canonical.certification::__audio__
- 2013.com.canonical.certification::audio/generator_.*
+ # 2013.com.canonical.certification::__audio__
 2013.com.canonical.certification::audio/alsa_info_collect
 2013.com.canonical.certification::audio/alsa_info_attachment
 2013.com.canonical.certification::audio/list_devices
@@ -53,49 +50,41 @@ include:
 2013.com.canonical.certification::audio/playback_auto certification-status=blocker
 2013.com.canonical.certification::audio/alsa_record_playback_internal certification-status=blocker
 2013.com.canonical.certification::audio/alsa_record_playback_automated certification-status=blocker
- # See Monitor / Graphic test section for hybrid-graphic monitor audio tests
- 2013.com.canonical.certification::__benchmarks__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__bluetooth__
+ # 2013.com.canonical.certification::__benchmarks__
+ # 2013.com.canonical.certification::__bluetooth__
 2013.com.canonical.certification::bluetooth/detect-output certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio-a2dp certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio certification-status=blocker
 2013.com.canonical.certification::bluetooth/browse-files certification-status=blocker
 2013.com.canonical.certification::bluetooth/file-transfer certification-status=blocker
 2013.com.canonical.certification::bluetooth/HID
- 2013.com.canonical.certification::__camera__
+ # 2013.com.canonical.certification::__camera__
 2013.com.canonical.certification::camera/detect certification-status=blocker
 2013.com.canonical.certification::camera/still certification-status=blocker
 2013.com.canonical.certification::camera/display certification-status=blocker
 2013.com.canonical.certification::camera/multiple-resolution-images certification-status=blocker
- 2013.com.canonical.certification::__cpu__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__cpu__
 2013.com.canonical.certification::cpu/cstates certification-status=blocker
 2013.com.canonical.certification::cpu/cstates_results.log
- 2013.com.canonical.certification::__disk__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__disk__
 2013.com.canonical.certification::disk/detect certification-status=blocker
- 2013.com.canonical.certification::__ethernet__
- # See Networking section below
- 2013.com.canonical.certification::__esata__
+ # 2013.com.canonical.certification::__ethernet__
+ # 2013.com.canonical.certification::__esata__
 2013.com.canonical.certification::esata/insert certification-status=blocker
 2013.com.canonical.certification::esata/storage-test certification-status=blocker
 2013.com.canonical.certification::esata/remove certification-status=blocker
- 2013.com.canonical.certification::__expresscard__
+ # 2013.com.canonical.certification::__expresscard__
 2013.com.canonical.certification::expresscard/verification certification-status=blocker
- 2013.com.canonical.certification::__firewire__
+ # 2013.com.canonical.certification::__firewire__
 2013.com.canonical.certification::firewire/insert certification-status=blocker
 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
 2013.com.canonical.certification::firewire/remove certification-status=blocker
- 2013.com.canonical.certification::__thunderbolt__
+ # 2013.com.canonical.certification::__thunderbolt__
 2013.com.canonical.certification::thunderbolt/insert certification-status=non-blocker
 2013.com.canonical.certification::thunderbolt/storage-test certification-status=non-blocker
 2013.com.canonical.certification::thunderbolt/remove certification-status=non-blocker
- # See the Thunderbolt monitor test for the daisy-chain test
- 2013.com.canonical.certification::__firmware__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__monitor__
- 2013.com.canonical.certification::monitor/generator_.*
+ # 2013.com.canonical.certification::__firmware__
+ # 2013.com.canonical.certification::__monitor__
 2013.com.canonical.certification::monitor/1_powersaving_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_dim_brightness_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_displayport_.* certification-status=blocker
@@ -111,8 +100,7 @@ include:
 2013.com.canonical.certification::monitor/1_vga_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_multi-head_.* certification-status=blocker
 # See Graphic Tests section for monitor test on second graphic card
- 2013.com.canonical.certification::__graphics__
- 2013.com.canonical.certification::graphics/generator_.*
+ # 2013.com.canonical.certification::__graphics__
 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
@@ -147,18 +135,15 @@ include:
 2013.com.canonical.certification::monitor/2_svideo_.* certification-status=blocker
 2013.com.canonical.certification::monitor/2_vga_.* certification-status=blocker
 2013.com.canonical.certification::monitor/2_multi-head_.* certification-status=blocker
- 2013.com.canonical.certification::__hibernate__
- #See below, power-management/hibernate_advanced
- 2013.com.canonical.certification::__input__
+ # 2013.com.canonical.certification::__hibernate__
+ # 2013.com.canonical.certification::__input__
 2013.com.canonical.certification::input/accelerometer_verify certification-status=non-blocker
 2013.com.canonical.certification::input/accelerometer certification-status=non-blocker
- 2013.com.canonical.certification::input/pointing
 2013.com.canonical.certification::input/pointing_.* certification-status=blocker
- 2013.com.canonical.certification::input/clicking
 2013.com.canonical.certification::input/clicking_.* certification-status=blocker
 2013.com.canonical.certification::input/keyboard certification-status=blocker
 2013.com.canonical.certification::disk/hdd-parking certification-status=non-blocker
- 2013.com.canonical.certification::__keys__
+ # 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/lock-screen certification-status=blocker
 2013.com.canonical.certification::keys/super certification-status=blocker
 2013.com.canonical.certification::keys/battery-info certification-status=blocker
@@ -172,7 +157,7 @@ include:
 2013.com.canonical.certification::keys/keyboard-overhead-light certification-status=blocker
 2013.com.canonical.certification::keys/microphone-mute certification-status=blocker
 2013.com.canonical.certification::keys/touchpad certification-status=blocker
- 2013.com.canonical.certification::__led__
+ # 2013.com.canonical.certification::__led__
 2013.com.canonical.certification::led/bluetooth certification-status=non-blocker
 2013.com.canonical.certification::led/camera certification-status=blocker
 2013.com.canonical.certification::led/caps-lock certification-status=blocker
@@ -194,7 +179,7 @@ include:
 2013.com.canonical.certification::led/wlan-disabled
 2013.com.canonical.certification::led/hdd
 2013.com.canonical.certification::led/touchpad
- 2013.com.canonical.certification::__mediacard__
+ # 2013.com.canonical.certification::__mediacard__
 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
@@ -204,46 +189,32 @@ include:
 2013.com.canonical.certification::mediacard/sdhc-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sdhc-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sdhc-remove certification-status=blocker
- 2013.com.canonical.certification::__memory__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__memory__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
 2013.com.canonical.certification::miscellanea/oops_results.log
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__mobilebroadband__
+ # 2013.com.canonical.certification::__mobilebroadband__
 2013.com.canonical.certification::mobilebroadband/gsm_connection certification-status=non-blocker
 2013.com.canonical.certification::mobilebroadband/cdma_connection certification-status=non-blocker
- 2013.com.canonical.certification::__networking__
- # See before the Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__networking__
 2013.com.canonical.certification::ethernet/detect certification-status=blocker
 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
- 2013.com.canonical.certification::networking/info certification-status=blocker
- 2013.com.canonical.certification::networking/info_eth\d certification-status=blocker
- 2013.com.canonical.certification::networking/info_wlan\d certification-status=blocker
+ 2013.com.canonical.certification::networking/info.* certification-status=blocker
 2013.com.canonical.certification::networking/ntp certification-status=blocker
- 2013.com.canonical.certification::__optical__
+ # 2013.com.canonical.certification::__optical__
 2013.com.canonical.certification::optical/detect certification-status=blocker
- 2013.com.canonical.certification::optical/read certification-status=blocker
 2013.com.canonical.certification::optical/read_.* certification-status=blocker
- 2013.com.canonical.certification::optical/cdrom-write certification-status=blocker
 2013.com.canonical.certification::optical/cdrom-write_.* certification-status=blocker
- 2013.com.canonical.certification::optical/dvd-write certification-status=blocker
 2013.com.canonical.certification::optical/dvd-write_.* certification-status=blocker
- 2013.com.canonical.certification::optical/bluray-read certification-status=blocker
 2013.com.canonical.certification::optical/bluray-read_.* certification-status=blocker
- 2013.com.canonical.certification::optical/bluray-write certification-status=blocker
 2013.com.canonical.certification::optical/bluray-write_.* certification-status=blocker
- 2013.com.canonical.certification::__power-management__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::power-management/generator_.*
- 2013.com.canonical.certification::power-management/lid certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ # 2013.com.canonical.certification::__power-management__
+ # Laptop lid tests relocated to the S3-adv section as it will trigger S3 as well
 2013.com.canonical.certification::power-management/rtc certification-status=blocker
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::__touchpad__
+ # 2013.com.canonical.certification::__touchpad__
 2013.com.canonical.certification::touchpad/detected-as-mouse certification-status=blocker
 2013.com.canonical.certification::touchpad/continuous-move certification-status=blocker
 2013.com.canonical.certification::touchpad/horizontal certification-status=blocker
@@ -258,14 +229,14 @@ include:
 2013.com.canonical.certification::touchpad/multitouch-vertical certification-status=blocker
 2013.com.canonical.certification::touchpad/multitouch-zoom certification-status=non-blocker
 2013.com.canonical.certification::touchpad/multitouch-dash certification-status=non-blocker
- 2013.com.canonical.certification::__touchscreen__
+ # 2013.com.canonical.certification::__touchscreen__
 2013.com.canonical.certification::touchscreen/drag-n-drop certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-zoom certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-rotate
 2013.com.canonical.certification::touchscreen/3-touch-tap certification-status=blocker
 2013.com.canonical.certification::touchscreen/4-touch-tap certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-dash certification-status=non-blocker
- 2013.com.canonical.certification::__usb__
+ # 2013.com.canonical.certification::__usb__
 2013.com.canonical.certification::usb/detect certification-status=blocker
 2013.com.canonical.certification::usb/HID certification-status=blocker
 2013.com.canonical.certification::usb/insert certification-status=blocker
@@ -274,7 +245,7 @@ include:
 2013.com.canonical.certification::usb3/insert certification-status=blocker
 2013.com.canonical.certification::usb3/storage-automated certification-status=blocker
 2013.com.canonical.certification::usb3/remove certification-status=blocker
- 2013.com.canonical.certification::__wireless__
+ # 2013.com.canonical.certification::__wireless__
 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_bg certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_bg certification-status=blocker
@@ -282,8 +253,7 @@ include:
 2013.com.canonical.certification::wireless/wireless_connection_open_n certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
- 2013.com.canonical.certification::__suspend__
- 2013.com.canonical.certification::suspend/generator_.*
+ # 2013.com.canonical.certification::__suspend__
 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/audio_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cpu_before_suspend certification-status=blocker
@@ -316,6 +286,9 @@ include:
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
 2013.com.canonical.certification::suspend/1_hybrid_sleep_.* certification-status=non-blocker
 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
@@ -344,9 +317,7 @@ include:
 2013.com.canonical.certification::suspend/alsa_record_playback_external-after-suspend certification-status=blocker
 2013.com.canonical.certification::camera/display_after_suspend certification-status=blocker
 2013.com.canonical.certification::camera/still_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/pointing-after-suspend
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/clicking-after-suspend
 2013.com.canonical.certification::suspend/clicking-after-suspend_.* certification-status=blocker
 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
@@ -408,7 +379,6 @@ include:
 # 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.
- 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz
@@ -417,9 +387,7 @@ include:
 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
 2013.com.canonical.certification::firmware/no_ACPI_REV_interface
 2013.com.canonical.certification::miscellanea/dmitest_client
- 2013.com.canonical.certification::benchmarks/disk/hdparm-read
 2013.com.canonical.certification::benchmarks/disk/hdparm-read_.*
- 2013.com.canonical.certification::benchmarks/disk/hdparm-cache-read
 2013.com.canonical.certification::benchmarks/disk/hdparm-cache-read_.*
 2013.com.canonical.certification::benchmarks/graphics/gtkperf
 2013.com.canonical.certification::cpu/scaling_test certification-status=blocker
@@ -429,21 +397,17 @@ include:
 2013.com.canonical.certification::cpu/offlining_test certification-status=blocker
 2013.com.canonical.certification::cpu/topology certification-status=blocker
 2013.com.canonical.certification::cpu/clocktest
- 2013.com.canonical.certification::disk/stats
 2013.com.canonical.certification::disk/stats_.*
- 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
- 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
 2013.com.canonical.certification::power-management/suspend_30_cycles certification-status=blocker
 2013.com.canonical.certification::power-management/suspend-30-cycle-log-attach
 2013.com.canonical.certification::power-management/suspend-30-cycles-time-check certification-status=non-blocker
- #Info attachment jobs
- 2013.com.canonical.certification::__info__
+ # Info attachment jobs
+ # 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
 2013.com.canonical.certification::cpuinfo_attachment
 2013.com.canonical.certification::dmesg_attachment
@@ -466,13 +430,15 @@ include:
 2013.com.canonical.certification::lsmod_attachment
 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
- 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
- 2013.com.canonical.certification::info/buildstamp
+bootstrap_include:
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::fwts
+ 2013.com.canonical.certification::graphics_card
 mandatory_include:
+ 2013.com.canonical.plainbox::collect-manifest
 # Meta-job to include required resources, don't remove.
 2013.com.canonical.certification::miscellanea/submission-resources
- 2013.com.canonical.plainbox::collect-manifest
diff --git a/units/somerville-cpu.pxu b/units/somerville-cpu.pxu
index a816999..1ee174e 100644
--- a/units/somerville-cpu.pxu
+++ b/units/somerville-cpu.pxu
@@ -3,7 +3,7 @@ _name: Somerville CPU
 unit: test plan
 include:
 ## CPU Whitelist for Dell projects
- ## Rev 1.0, 2015-03-17
+ ## Rev 1.1, 2016-03-29
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -20,16 +20,14 @@ include:
 2013.com.canonical.certification::meminfo
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
- 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
 2013.com.canonical.certification::sleep
- 2013.com.canonical.certification::touchpad_scroll
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
 2013.com.canonical.certification::resource
- # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
 somerville
@@ -39,22 +37,18 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
 2013.com.canonical.certification::miscellanea/chvt
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__audio__
+ # 2013.com.canonical.certification::__audio__
 2013.com.canonical.certification::audio/playback_hdmi certification-status=blocker
 2013.com.canonical.certification::audio/playback_displayport certification-status=blocker
- 2013.com.canonical.certification::__benchmarks__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__cpu__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__benchmarks__
+ # 2013.com.canonical.certification::__cpu__
 2013.com.canonical.certification::cpu/cstates certification-status=blocker
 2013.com.canonical.certification::cpu/cstates_results.log
- 2013.com.canonical.certification::__graphics__
+ # 2013.com.canonical.certification::__graphics__
 somerville/amd-graphics-mode-default-value
- 2013.com.canonical.certification::graphics/generator_.*
 2013.com.canonical.certification::graphics/1_maximum_resolution_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_glxgears_.* certification-status=blocker
 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
@@ -76,11 +70,10 @@ include:
 2013.com.canonical.certification::graphics/2_display_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_minimum_resolution_.*
 2013.com.canonical.certification::graphics/2_cycle_resolution_.*
- 2013.com.canonical.certification::__hibernate__
- #See below, power-management/hibernate_advanced
- 2013.com.canonical.certification::__keys__
+ # 2013.com.canonical.certification::__hibernate__
+ # 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/video-out certification-status=blocker
- 2013.com.canonical.certification::__monitor__
+ # 2013.com.canonical.certification::__monitor__
 2013.com.canonical.certification::monitor/powersaving certification-status=blocker
 2013.com.canonical.certification::monitor/dim_brightness certification-status=blocker
 2013.com.canonical.certification::monitor/displayport certification-status=blocker
@@ -90,11 +83,7 @@ include:
 2013.com.canonical.certification::monitor/svideo certification-status=blocker
 2013.com.canonical.certification::monitor/vga certification-status=blocker
 2013.com.canonical.certification::monitor/multi-head certification-status=blocker
- 2013.com.canonical.certification::__power-management__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::power-management/lid certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ # 2013.com.canonical.certification::__power-management__
 2013.com.canonical.certification::power-management/rtc certification-status=blocker
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
@@ -102,15 +91,14 @@ include:
 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
 2013.com.canonical.certification::power-management/hibernate-single-log-check
 2013.com.canonical.certification::power-management/hibernate-single-log-attach
- 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
- 2013.com.canonical.certification::power-management/poweroff-log-attach
- 2013.com.canonical.certification::power-management/reboot certification-status=blocker
- 2013.com.canonical.certification::power-management/reboot-log-attach
- 2013.com.canonical.certification::__suspend__
+ # 2013.com.canonical.certification::__suspend__
 2013.com.canonical.certification::suspend/resolution_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
 2013.com.canonical.certification::suspend/suspend-single-log-check
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
 2013.com.canonical.certification::suspend/hybrid_sleep certification-status=non-blocker
 2013.com.canonical.certification::suspend/hybrid-sleep-single-log-attach
 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
@@ -129,6 +117,13 @@ include:
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
 somerville/suspend-on-AC-power
+ # 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.
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach
 # 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.
@@ -140,8 +135,8 @@ include:
 2013.com.canonical.certification::cpu/offlining_test certification-status=blocker
 2013.com.canonical.certification::cpu/topology certification-status=blocker
 2013.com.canonical.certification::cpu/clocktest
- #Info attachment jobs
- 2013.com.canonical.certification::__info__
+ # Info attachment jobs
+ # 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
 2013.com.canonical.certification::cpuinfo_attachment
 2013.com.canonical.certification::dmesg_attachment
@@ -149,19 +144,30 @@ include:
 2013.com.canonical.certification::dmidecode_attachment
 2013.com.canonical.certification::efi_attachment
 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
 2013.com.canonical.certification::modprobe_attachment
 2013.com.canonical.certification::modules_attachment
 2013.com.canonical.certification::sysctl_attachment
 2013.com.canonical.certification::sysfs_attachment
 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
- 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
+bootstrap_include:
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::fwts
+ 2013.com.canonical.certification::graphics_card
 mandatory_include:
+ 2013.com.canonical.plainbox::collect-manifest
+ # Meta-job to include required resources, don't remove.
 2013.com.canonical.certification::miscellanea/submission-resources
diff --git a/units/somerville-full.pxu b/units/somerville-full.pxu
index 544b8d6..cdf5f9f 100644
--- a/units/somerville-full.pxu
+++ b/units/somerville-full.pxu
@@ -3,7 +3,7 @@ _name: Somerville Full
 unit: test plan
 include:
 ## Full Whitelist for Dell projects
- ## Rev 1.4, 2015-10-01
+ ## Rev 1.5, 2016-03-28
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -20,7 +20,6 @@ include:
 2013.com.canonical.certification::meminfo
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
- 2013.com.canonical.certification::optical_drive
 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
@@ -29,7 +28,6 @@ include:
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
 2013.com.canonical.certification::resource
- # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
 somerville
@@ -42,9 +40,7 @@ include:
 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
 2013.com.canonical.certification::miscellanea/chvt
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__audio__
- 2013.com.canonical.certification::audio/generator_.*
+ # 2013.com.canonical.certification::__audio__
 2013.com.canonical.certification::audio/alsa_info_collect
 2013.com.canonical.certification::audio/alsa_info_attachment
 2013.com.canonical.certification::audio/list_devices
@@ -56,51 +52,44 @@ include:
 2013.com.canonical.certification::audio/alsa_record_playback_internal certification-status=blocker
 2013.com.canonical.certification::audio/alsa_record_playback_automated certification-status=blocker
 2013.com.canonical.certification::audio/channels 
- 2013.com.canonical.certification::__benchmarks__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__codecs__
+ # 2013.com.canonical.certification::__benchmarks__
+ # 2013.com.canonical.certification::__codecs__
 2013.com.canonical.certification::codecs/ogg-vorbis
 2013.com.canonical.certification::codecs/wav 
- 2013.com.canonical.certification::__bluetooth__
+ # 2013.com.canonical.certification::__bluetooth__
 2013.com.canonical.certification::bluetooth/detect-output certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio-a2dp certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio certification-status=blocker
 2013.com.canonical.certification::bluetooth/browse-files certification-status=blocker
 2013.com.canonical.certification::bluetooth/file-transfer certification-status=blocker
 2013.com.canonical.certification::bluetooth/HID
- 2013.com.canonical.certification::__camera__
+ # 2013.com.canonical.certification::__camera__
 2013.com.canonical.certification::camera/detect certification-status=blocker
 2013.com.canonical.certification::camera/still certification-status=blocker
 2013.com.canonical.certification::camera/display certification-status=blocker
 2013.com.canonical.certification::camera/multiple-resolution-images certification-status=blocker
- 2013.com.canonical.certification::__cpu__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__cpu__
 2013.com.canonical.certification::cpu/cstates certification-status=blocker
 2013.com.canonical.certification::cpu/cstates_results.log
- 2013.com.canonical.certification::__disk__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__disk__
 2013.com.canonical.certification::disk/detect certification-status=blocker
- 2013.com.canonical.certification::__ethernet__
- # See Networking section below
- 2013.com.canonical.certification::__esata__
+ # 2013.com.canonical.certification::__ethernet__
+ # 2013.com.canonical.certification::__esata__
 2013.com.canonical.certification::esata/insert certification-status=blocker
 2013.com.canonical.certification::esata/storage-test certification-status=blocker
 2013.com.canonical.certification::esata/remove certification-status=blocker
- 2013.com.canonical.certification::__expresscard__
+ # 2013.com.canonical.certification::__expresscard__
 2013.com.canonical.certification::expresscard/verification certification-status=blocker
- 2013.com.canonical.certification::__firewire__
+ # 2013.com.canonical.certification::__firewire__
 2013.com.canonical.certification::firewire/insert certification-status=blocker
 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
 2013.com.canonical.certification::firewire/remove certification-status=blocker
- 2013.com.canonical.certification::__thunderbolt__
+ # 2013.com.canonical.certification::__thunderbolt__
 2013.com.canonical.certification::thunderbolt/insert certification-status=non-blocker
 2013.com.canonical.certification::thunderbolt/storage-test certification-status=non-blocker
 2013.com.canonical.certification::thunderbolt/remove certification-status=non-blocker
- # See the Thunderbolt monitor test for the daisy-chain test
- 2013.com.canonical.certification::__firmware__
- # See Automated Tests section at the end of this file 
- 2013.com.canonical.certification::__monitor__
- 2013.com.canonical.certification::monitor/generator_.*
+ # 2013.com.canonical.certification::__firmware__ 
+ # 2013.com.canonical.certification::__monitor__
 2013.com.canonical.certification::monitor/1_powersaving_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_dim_brightness_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_displayport_.* certification-status=blocker
@@ -116,9 +105,8 @@ include:
 2013.com.canonical.certification::monitor/1_vga_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_multi-head_.* certification-status=blocker
 # See Graphic Tests section for monitor test on second graphic card 
- 2013.com.canonical.certification::__graphics__
+ # 2013.com.canonical.certification::__graphics__
 somerville/amd-graphics-mode-default-value
- 2013.com.canonical.certification::graphics/generator_.*
 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
@@ -153,18 +141,15 @@ include:
 2013.com.canonical.certification::monitor/2_svideo_.* certification-status=blocker
 2013.com.canonical.certification::monitor/2_vga_.* certification-status=blocker
 2013.com.canonical.certification::monitor/2_multi-head_.* certification-status=blocker
- 2013.com.canonical.certification::__hibernate__
- #See below, power-management/hibernate_advanced
- 2013.com.canonical.certification::__input__
+ # 2013.com.canonical.certification::__hibernate__
+ # 2013.com.canonical.certification::__input__
 2013.com.canonical.certification::input/accelerometer_verify certification-status=non-blocker
 2013.com.canonical.certification::input/accelerometer certification-status=non-blocker
- 2013.com.canonical.certification::input/pointing
 2013.com.canonical.certification::input/pointing_.* certification-status=blocker
- 2013.com.canonical.certification::input/clicking
 2013.com.canonical.certification::input/clicking_.* certification-status=blocker
 2013.com.canonical.certification::input/keyboard certification-status=blocker
 2013.com.canonical.certification::disk/hdd-parking certification-status=non-blocker
- 2013.com.canonical.certification::__keys__
+ # 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/lock-screen certification-status=blocker
 2013.com.canonical.certification::keys/super certification-status=blocker
 2013.com.canonical.certification::keys/battery-info certification-status=blocker
@@ -178,7 +163,7 @@ include:
 2013.com.canonical.certification::keys/keyboard-overhead-light certification-status=blocker
 2013.com.canonical.certification::keys/microphone-mute certification-status=blocker
 2013.com.canonical.certification::keys/touchpad
- 2013.com.canonical.certification::__led__
+ # 2013.com.canonical.certification::__led__
 2013.com.canonical.certification::led/bluetooth certification-status=non-blocker
 2013.com.canonical.certification::led/camera certification-status=blocker
 2013.com.canonical.certification::led/caps-lock certification-status=blocker
@@ -200,7 +185,7 @@ include:
 2013.com.canonical.certification::led/wlan-disabled
 2013.com.canonical.certification::led/hdd
 2013.com.canonical.certification::led/touchpad
- 2013.com.canonical.certification::__mediacard__
+ # 2013.com.canonical.certification::__mediacard__
 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
@@ -219,50 +204,32 @@ include:
 2013.com.canonical.certification::mediacard/xd-insert
 2013.com.canonical.certification::mediacard/xd-storage
 2013.com.canonical.certification::mediacard/xd-remove
- 2013.com.canonical.certification::__memory__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__memory__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
 2013.com.canonical.certification::miscellanea/oops_results.log
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__mobilebroadband__
+ # 2013.com.canonical.certification::__mobilebroadband__
 2013.com.canonical.certification::mobilebroadband/gsm_connection certification-status=non-blocker
 2013.com.canonical.certification::mobilebroadband/cdma_connection certification-status=non-blocker
- 2013.com.canonical.certification::__networking__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__networking__
 2013.com.canonical.certification::ethernet/detect certification-status=blocker
 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
- 2013.com.canonical.certification::networking/info certification-status=blocker
- 2013.com.canonical.certification::networking/info_eth\d
- 2013.com.canonical.certification::networking/info_wlan\d
+ 2013.com.canonical.certification::networking/info.* certification-status=blocker
 2013.com.canonical.certification::networking/ntp certification-status=blocker
- 2013.com.canonical.certification::__optical__
+ # 2013.com.canonical.certification::__optical__
 2013.com.canonical.certification::optical/detect certification-status=blocker
- 2013.com.canonical.certification::optical/read certification-status=blocker
 2013.com.canonical.certification::optical/read_.* certification-status=blocker
- 2013.com.canonical.certification::optical/cdrom-write certification-status=blocker
 2013.com.canonical.certification::optical/cdrom-write_.* certification-status=blocker
- 2013.com.canonical.certification::optical/dvd-write certification-status=blocker
 2013.com.canonical.certification::optical/dvd-write_.* certification-status=blocker
- 2013.com.canonical.certification::optical/bluray-read certification-status=blocker
 2013.com.canonical.certification::optical/bluray-read_.* certification-status=blocker
- 2013.com.canonical.certification::optical/bluray-write certification-status=blocker
 2013.com.canonical.certification::optical/bluray-write_.* certification-status=blocker
- 2013.com.canonical.certification::__power-management__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::power-management/generator_.*
- 2013.com.canonical.certification::power-management/lid certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ # 2013.com.canonical.certification::__power-management__
+ # Laptop lid tests relocated to the S3-adv section as it will trigger S3 as well
 2013.com.canonical.certification::power-management/rtc certification-status=blocker
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
- 2013.com.canonical.certification::power-management/poweroff-log-attach
- 2013.com.canonical.certification::power-management/reboot certification-status=blocker
- 2013.com.canonical.certification::power-management/reboot-log-attach
- 2013.com.canonical.certification::__touchpad__
+ # 2013.com.canonical.certification::__touchpad__
 2013.com.canonical.certification::touchpad/detected-as-mouse certification-status=blocker
 2013.com.canonical.certification::touchpad/continuous-move certification-status=blocker
 2013.com.canonical.certification::touchpad/horizontal certification-status=blocker
@@ -277,14 +244,14 @@ include:
 2013.com.canonical.certification::touchpad/multitouch-vertical certification-status=blocker
 2013.com.canonical.certification::touchpad/multitouch-zoom certification-status=non-blocker
 2013.com.canonical.certification::touchpad/multitouch-dash certification-status=non-blocker
- 2013.com.canonical.certification::__touchscreen__
+ # 2013.com.canonical.certification::__touchscreen__
 2013.com.canonical.certification::touchscreen/drag-n-drop certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-zoom certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-rotate
 2013.com.canonical.certification::touchscreen/3-touch-tap certification-status=blocker
 2013.com.canonical.certification::touchscreen/4-touch-tap certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-dash certification-status=non-blocker
- 2013.com.canonical.certification::__usb__
+ # 2013.com.canonical.certification::__usb__
 2013.com.canonical.certification::usb/detect certification-status=blocker
 2013.com.canonical.certification::usb/HID certification-status=blocker
 2013.com.canonical.certification::usb/insert certification-status=blocker
@@ -292,9 +259,8 @@ include:
 2013.com.canonical.certification::usb/remove certification-status=blocker
 2013.com.canonical.certification::usb3/insert certification-status=blocker
 2013.com.canonical.certification::usb3/storage-automated certification-status=blocker
- 2013.com.canonical.certification::usb3/superspeed_performance certification-status=blocker
 2013.com.canonical.certification::usb3/remove certification-status=blocker
- 2013.com.canonical.certification::__wireless__
+ # 2013.com.canonical.certification::__wireless__
 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_bg certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_bg certification-status=blocker
@@ -302,8 +268,7 @@ include:
 2013.com.canonical.certification::wireless/wireless_connection_open_n certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
- 2013.com.canonical.certification::__suspend__
- 2013.com.canonical.certification::suspend/generator_.*
+ # 2013.com.canonical.certification::__suspend__
 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/audio_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cpu_before_suspend certification-status=blocker
@@ -336,6 +301,9 @@ include:
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
 2013.com.canonical.certification::suspend/1_hybrid_sleep_.* certification-status=non-blocker
 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
@@ -364,9 +332,7 @@ include:
 2013.com.canonical.certification::suspend/alsa_record_playback_external-after-suspend certification-status=blocker
 2013.com.canonical.certification::camera/display_after_suspend certification-status=blocker
 2013.com.canonical.certification::camera/still_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/pointing-after-suspend
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/clicking-after-suspend
 2013.com.canonical.certification::suspend/clicking-after-suspend_.* certification-status=blocker
 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
@@ -429,13 +395,20 @@ include:
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
- somerville/suspend-on-AC-power 
- 2013.com.canonical.certification::__install__
+ somerville/suspend-on-AC-power
+ # 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.
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach 
+ # 2013.com.canonical.certification::__install__
 2013.com.canonical.certification::install/apt-get-gets-updates
 # 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.
- 2013.com.canonical.certification::firmware/generator_.*
+ # 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.
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz 
@@ -444,9 +417,7 @@ include:
 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
 2013.com.canonical.certification::firmware/no_ACPI_REV_interface
 2013.com.canonical.certification::miscellanea/dmitest_client
- 2013.com.canonical.certification::benchmarks/disk/hdparm-read
 2013.com.canonical.certification::benchmarks/disk/hdparm-read_.*
- 2013.com.canonical.certification::benchmarks/disk/hdparm-cache-read
 2013.com.canonical.certification::benchmarks/disk/hdparm-cache-read_.*
 2013.com.canonical.certification::benchmarks/graphics/gtkperf
 2013.com.canonical.certification::cpu/scaling_test certification-status=blocker
@@ -456,18 +427,14 @@ include:
 2013.com.canonical.certification::cpu/offlining_test certification-status=blocker
 2013.com.canonical.certification::cpu/topology certification-status=blocker
 2013.com.canonical.certification::cpu/clocktest
- 2013.com.canonical.certification::disk/stats
 2013.com.canonical.certification::disk/stats_.*
- 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
- 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
- #Info attachment jobs
- 2013.com.canonical.certification::__info__
+ # Info attachment jobs
+ # 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
 2013.com.canonical.certification::cpuinfo_attachment
 2013.com.canonical.certification::dmesg_attachment
@@ -490,13 +457,15 @@ include:
 2013.com.canonical.certification::lsmod_attachment
 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
- 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
- 2013.com.canonical.certification::info/buildstamp
+bootstrap_include:
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::fwts
+ 2013.com.canonical.certification::graphics_card
 mandatory_include:
- # Meta-job to include required resources, don't remove.
- 2013.com.canonical.certification::miscellanea/submission-resources
 2013.com.canonical.plainbox::collect-manifest
+ # Meta-job to include required resources, don't remove.
+ 2013.com.canonical.certification::miscellanea/submission-resources 
diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index e6efde0..40c91b0 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -3,7 +3,7 @@ _name: Somerville Graphics
 unit: test plan
 include:
 ## Graphic Whitelist for Dell projects
- ## Rev 1.3, 2015-10-05
+ ## Rev 1.4, 2016-03-29
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -20,7 +20,6 @@ include:
 2013.com.canonical.certification::meminfo
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
- 2013.com.canonical.certification::optical_drive
 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
@@ -29,7 +28,6 @@ include:
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
 2013.com.canonical.certification::resource
- # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
 somerville
@@ -39,25 +37,17 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
 2013.com.canonical.certification::miscellanea/chvt
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__audio__
- 2013.com.canonical.certification::audio/generator_.*
- 2013.com.canonical.certification::__benchmarks__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__disk__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__audio__
+ # 2013.com.canonical.certification::__benchmarks__
+ # 2013.com.canonical.certification::__disk__
 2013.com.canonical.certification::disk/detect certification-status=blocker
- 2013.com.canonical.certification::__ethernet__
- # See Networking section below
- 2013.com.canonical.certification::__thunderbolt__
- # See the Thunderbolt monitor test for the daisy-chain test
- 2013.com.canonical.certification::__firmware__
- # See Automated Tests section at the end of this file 
- 2013.com.canonical.certification::__monitor__
- 2013.com.canonical.certification::monitor/generator_.*
+ # 2013.com.canonical.certification::__ethernet__
+ # 2013.com.canonical.certification::__thunderbolt__
+ # 2013.com.canonical.certification::__firmware__
+ # 2013.com.canonical.certification::__monitor__
 2013.com.canonical.certification::monitor/1_powersaving_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_dim_brightness_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_displayport_.* certification-status=blocker
@@ -73,9 +63,8 @@ include:
 2013.com.canonical.certification::monitor/1_vga_.* certification-status=blocker
 2013.com.canonical.certification::monitor/1_multi-head_.* certification-status=blocker
 # See Graphic Tests section for monitor test on second graphic card 
- 2013.com.canonical.certification::__graphics__
+ # 2013.com.canonical.certification::__graphics__
 somerville/amd-graphics-mode-default-value
- 2013.com.canonical.certification::graphics/generator_.*
 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
@@ -110,40 +99,25 @@ include:
 2013.com.canonical.certification::monitor/2_svideo_.* certification-status=blocker
 2013.com.canonical.certification::monitor/2_vga_.* certification-status=blocker
 2013.com.canonical.certification::monitor/2_multi-head_.* certification-status=blocker
- 2013.com.canonical.certification::__hibernate__
- #See below, power-management/hibernate_advanced
- 2013.com.canonical.certification::__keys__
+ # 2013.com.canonical.certification::__hibernate__
+ # 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/video-out certification-status=blocker
- 2013.com.canonical.certification::__memory__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__memory__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
 2013.com.canonical.certification::miscellanea/oops_results.log
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__networking__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__networking__
 2013.com.canonical.certification::ethernet/detect certification-status=blocker
 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
- 2013.com.canonical.certification::networking/info certification-status=blocker
- 2013.com.canonical.certification::networking/info_eth\d
- 2013.com.canonical.certification::networking/info_wlan\d
+ 2013.com.canonical.certification::networking/info.*
 2013.com.canonical.certification::networking/ntp certification-status=blocker
- 2013.com.canonical.certification::__power-management__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::power-management/generator_.*
- 2013.com.canonical.certification::power-management/lid certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ # 2013.com.canonical.certification::__power-management__
+ # Laptop lid tests relocated to the S3-adv section as it will trigger S3 as well
 2013.com.canonical.certification::power-management/rtc certification-status=blocker
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
- 2013.com.canonical.certification::power-management/poweroff-log-attach
- 2013.com.canonical.certification::power-management/reboot certification-status=blocker
- 2013.com.canonical.certification::power-management/reboot-log-attach
- 2013.com.canonical.certification::__suspend__
- 2013.com.canonical.certification::suspend/generator_.*
+ # 2013.com.canonical.certification::__suspend__
 2013.com.canonical.certification::suspend/memory_before_suspend certification-status=blocker
 # Test card 2 first, if present, since it's the one we will be using
 # after coming back from suspend if the system has hybrid graphics.
@@ -170,6 +144,9 @@ include:
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
 2013.com.canonical.certification::suspend/1_hybrid_sleep_.* certification-status=non-blocker
 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
@@ -187,11 +164,18 @@ include:
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
- somerville/suspend-on-AC-power 
+ somerville/suspend-on-AC-power
+ # 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. 
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach 
 # 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.
- 2013.com.canonical.certification::firmware/generator_.*
+ # 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.
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz 
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log.gz 
@@ -200,18 +184,14 @@ include:
 2013.com.canonical.certification::firmware/no_ACPI_REV_interface
 2013.com.canonical.certification::miscellanea/dmitest_client
 2013.com.canonical.certification::benchmarks/graphics/gtkperf
- 2013.com.canonical.certification::disk/stats
 2013.com.canonical.certification::disk/stats_.*
- 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
- 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
- #Info attachment jobs
- 2013.com.canonical.certification::__info__
+ # Info attachment jobs
+ # 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
 2013.com.canonical.certification::cpuinfo_attachment
 2013.com.canonical.certification::dmesg_attachment
@@ -234,12 +214,15 @@ include:
 2013.com.canonical.certification::lsmod_attachment
 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
- 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
- 2013.com.canonical.certification::info/buildstamp
+bootstrap_include:
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::fwts
+ 2013.com.canonical.certification::graphics_card
 mandatory_include:
- 2013.com.canonical.certification::miscellanea/submission-resources
 2013.com.canonical.plainbox::collect-manifest
+ # Meta-job to include required resources, don't remove.
+ 2013.com.canonical.certification::miscellanea/submission-resources
diff --git a/units/somerville-stress.pxu b/units/somerville-stress.pxu
index dcf175c..637bae3 100644
--- a/units/somerville-stress.pxu
+++ b/units/somerville-stress.pxu
@@ -3,7 +3,7 @@ _name: Somerville Stress
 unit: test plan
 include:
 ## Stress Whitelist for Dell projects
- ## Rev 1.2, 2015-11-16
+ ## Rev 1.3, 2016-03-29
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -20,7 +20,6 @@ include:
 2013.com.canonical.certification::meminfo
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
- 2013.com.canonical.certification::optical_drive
 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
@@ -29,22 +28,21 @@ include:
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
 2013.com.canonical.certification::resource
- # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
 somerville
 somerville/phase-sku
 somerville/query-bto-version
 somerville/manifest_version
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
 2013.com.canonical.certification::miscellanea/fwts_test
 2013.com.canonical.certification::miscellanea/fwts_results.log
- 2013.com.canonical.certification::__power-management__
+ # 2013.com.canonical.certification::__power-management__
 2013.com.canonical.certification::power-management/rtc certification-status=blocker
- 2013.com.canonical.certification::__suspend__
+ # 2013.com.canonical.certification::__suspend__
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
- 2013.com.canonical.certification::__hibernate__
+ # 2013.com.canonical.certification::__hibernate__
 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
 2013.com.canonical.certification::power-management/suspend_30_cycles certification-status=blocker
 2013.com.canonical.certification::power-management/suspend-30-cycles-log-check
@@ -57,12 +55,45 @@ include:
 2013.com.canonical.certification::power-management/hibernate_30_cycles certification-status=non-blocker
 2013.com.canonical.certification::power-management/hibernate-30-cycles-log-check
 2013.com.canonical.certification::power-management/hibernate-30-cycle-log-attach
- 2013.com.canonical.certification::__stress__
+ # 2013.com.canonical.certification::__stress__
 2013.com.canonical.certification::stress/cpu_stress_test certification-status=blocker
 2013.com.canonical.certification::stress/reboot_30
 2013.com.canonical.certification::stress/reboot_30_log
 2013.com.canonical.certification::stress/poweroff_30
 2013.com.canonical.certification::stress/poweroff_30_log
+# Info attachment jobs
+ # 2013.com.canonical.certification::__info__
+ 2013.com.canonical.certification::codecs_attachment
+ 2013.com.canonical.certification::cpuinfo_attachment
+ 2013.com.canonical.certification::dmesg_attachment
+ 2013.com.canonical.certification::dmi_attachment
+ 2013.com.canonical.certification::dmidecode_attachment
+ 2013.com.canonical.certification::efi_attachment
+ 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
+ 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
+ 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
+ 2013.com.canonical.certification::modprobe_attachment
+ 2013.com.canonical.certification::modules_attachment
+ 2013.com.canonical.certification::sysctl_attachment
+ 2013.com.canonical.certification::sysfs_attachment
+ 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
+ 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
+ 2013.com.canonical.certification::acpi_sleep_attachment
+ 2013.com.canonical.certification::info/hdparm_.*.txt
+ 2013.com.canonical.certification::installer_debug.gz
+ 2013.com.canonical.certification::info/touchpad_driver
+ 2013.com.canonical.certification::info/disk_partitions
+bootstrap_include:
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::fwts
+ 2013.com.canonical.certification::graphics_card
 mandatory_include:
- 2013.com.canonical.certification::miscellanea/submission-resources
 2013.com.canonical.plainbox::collect-manifest
+ # Meta-job to include required resources, don't remove.
+ 2013.com.canonical.certification::miscellanea/submission-resources
diff --git a/units/somerville-touch-webcam.pxu b/units/somerville-touch-webcam.pxu
index ed80d4f..943a727 100644
--- a/units/somerville-touch-webcam.pxu
+++ b/units/somerville-touch-webcam.pxu
@@ -3,7 +3,7 @@ _name: Somerville Touch/Webcam
 unit: test plan
 include:
 ## Touch/Webcam Whitelist for Dell projects
- ## Rev 1.1, 2015-10-05
+ ## Rev 1.2, 2016-03-29
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -20,7 +20,6 @@ include:
 2013.com.canonical.certification::meminfo
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
- 2013.com.canonical.certification::optical_drive
 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
@@ -29,7 +28,6 @@ include:
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
 2013.com.canonical.certification::resource
- # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
 somerville
@@ -39,57 +37,38 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__camera__
+ # 2013.com.canonical.certification::__camera__
 2013.com.canonical.certification::camera/detect certification-status=blocker
 2013.com.canonical.certification::camera/still certification-status=blocker
 2013.com.canonical.certification::camera/display certification-status=blocker
 2013.com.canonical.certification::camera/multiple-resolution-images certification-status=blocker
- 2013.com.canonical.certification::__disk__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__disk__
 2013.com.canonical.certification::disk/detect certification-status=blocker
- 2013.com.canonical.certification::__ethernet__
- # See Networking section below
- 2013.com.canonical.certification::__firmware__
- # See Automated Tests section at the end of this file 
- 2013.com.canonical.certification::__hibernate__
- #See below, power-management/hibernate_advanced
- 2013.com.canonical.certification::__keys__
+ # 2013.com.canonical.certification::__ethernet__
+ # 2013.com.canonical.certification::__firmware__ 
+ # 2013.com.canonical.certification::__hibernate__
+ # 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/touchpad
- 2013.com.canonical.certification::__led__
+ # 2013.com.canonical.certification::__led__
 2013.com.canonical.certification::led/camera certification-status=blocker
 2013.com.canonical.certification::led/touchpad
- 2013.com.canonical.certification::__memory__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__memory__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
 2013.com.canonical.certification::miscellanea/oops_results.log
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__networking__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__networking__
 2013.com.canonical.certification::ethernet/detect certification-status=blocker
 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
- 2013.com.canonical.certification::networking/info certification-status=blocker
- 2013.com.canonical.certification::networking/info_eth\d
- 2013.com.canonical.certification::networking/info_wlan\d
+ 2013.com.canonical.certification::networking/info.* certification-status=blocker
 2013.com.canonical.certification::networking/ntp certification-status=blocker
- 2013.com.canonical.certification::__power-management__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::power-management/generator_.*
- 2013.com.canonical.certification::power-management/lid certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ # 2013.com.canonical.certification::__power-management__
 2013.com.canonical.certification::power-management/rtc certification-status=blocker
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
- 2013.com.canonical.certification::power-management/poweroff-log-attach
- 2013.com.canonical.certification::power-management/reboot certification-status=blocker
- 2013.com.canonical.certification::power-management/reboot-log-attach
- 2013.com.canonical.certification::__touchpad__
+ # 2013.com.canonical.certification::__touchpad__
 2013.com.canonical.certification::touchpad/detected-as-mouse certification-status=blocker
 2013.com.canonical.certification::touchpad/continuous-move certification-status=blocker
 2013.com.canonical.certification::touchpad/horizontal certification-status=blocker
@@ -104,18 +83,20 @@ include:
 2013.com.canonical.certification::touchpad/multitouch-vertical certification-status=blocker
 2013.com.canonical.certification::touchpad/multitouch-zoom certification-status=non-blocker
 2013.com.canonical.certification::touchpad/multitouch-dash certification-status=non-blocker
- 2013.com.canonical.certification::__touchscreen__
+ # 2013.com.canonical.certification::__touchscreen__
 2013.com.canonical.certification::touchscreen/drag-n-drop certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-zoom certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-rotate
 2013.com.canonical.certification::touchscreen/3-touch-tap certification-status=blocker
 2013.com.canonical.certification::touchscreen/4-touch-tap certification-status=blocker
 2013.com.canonical.certification::touchscreen/multitouch-dash certification-status=non-blocker
- 2013.com.canonical.certification::__suspend__
- 2013.com.canonical.certification::suspend/generator_.*
+ # 2013.com.canonical.certification::__suspend__
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
 2013.com.canonical.certification::suspend/1_hybrid_sleep_.* certification-status=non-blocker
 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
 2013.com.canonical.certification::suspend/keys_after_suspend/touchpad
@@ -126,30 +107,33 @@ include:
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
- somerville/suspend-on-AC-power 
+ somerville/suspend-on-AC-power
+ # 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.
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach 
 # 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.
- 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
- 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz 
- 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log.gz 
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz 
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log.gz 
 2013.com.canonical.certification::firmware/fwts_wakealarm.* certification-status=blocker
 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
 2013.com.canonical.certification::firmware/no_ACPI_REV_interface
 2013.com.canonical.certification::miscellanea/dmitest_client
- 2013.com.canonical.certification::disk/stats
+ 2013.com.canonical.certification::benchmarks/graphics/gtkperf
 2013.com.canonical.certification::disk/stats_.*
- 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
- 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
- #Info attachment jobs
- 2013.com.canonical.certification::__info__
+ # Info attachment jobs
+ # 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
 2013.com.canonical.certification::cpuinfo_attachment
 2013.com.canonical.certification::dmesg_attachment
@@ -172,12 +156,15 @@ include:
 2013.com.canonical.certification::lsmod_attachment
 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
- 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
- 2013.com.canonical.certification::info/buildstamp
+bootstrap_include:
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::fwts
+ 2013.com.canonical.certification::graphics_card
 mandatory_include:
- 2013.com.canonical.certification::miscellanea/submission-resources
 2013.com.canonical.plainbox::collect-manifest
+ # Meta-job to include required resources, don't remove.
+ 2013.com.canonical.certification::miscellanea/submission-resources
diff --git a/units/somerville-wireless.pxu b/units/somerville-wireless.pxu
index 090ba8e..521ca74 100644
--- a/units/somerville-wireless.pxu
+++ b/units/somerville-wireless.pxu
@@ -3,7 +3,7 @@ _name: Somerville Wireless
 unit: test plan
 include:
 ## Wireless Whitelist for Dell projects
- ## Rev 1.4, 2015-10-05
+ ## Rev 1.5, 2016-03-29
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -20,7 +20,6 @@ include:
 2013.com.canonical.certification::meminfo
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
- 2013.com.canonical.certification::optical_drive
 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
@@ -29,7 +28,6 @@ include:
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
 2013.com.canonical.certification::resource
- # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
 somerville
@@ -39,62 +37,42 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/dell-repository
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__benchmarks__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__bluetooth__
+ # 2013.com.canonical.certification::__benchmarks__
+ # 2013.com.canonical.certification::__bluetooth__
 2013.com.canonical.certification::bluetooth/detect-output certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio-a2dp certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio certification-status=blocker
 2013.com.canonical.certification::bluetooth/browse-files certification-status=blocker
 2013.com.canonical.certification::bluetooth/file-transfer certification-status=blocker
 2013.com.canonical.certification::bluetooth/HID
- 2013.com.canonical.certification::__disk__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__disk__
 2013.com.canonical.certification::disk/detect certification-status=blocker
- 2013.com.canonical.certification::__ethernet__
- # See Networking section below
- 2013.com.canonical.certification::__firmware__
- # See Automated Tests section at the end of this file 
- 2013.com.canonical.certification::__hibernate__
- #See below, power-management/hibernate_advanced
- 2013.com.canonical.certification::__keys__
+ # 2013.com.canonical.certification::__ethernet__
+ # 2013.com.canonical.certification::__firmware__
+ # 2013.com.canonical.certification::__hibernate__
+ # 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/wireless certification-status=blocker
- 2013.com.canonical.certification::__led__
+ # 2013.com.canonical.certification::__led__
 2013.com.canonical.certification::led/bluetooth certification-status=non-blocker
 2013.com.canonical.certification::led/wlan certification-status=non-blocker
 2013.com.canonical.certification::led/wlan-disabled
- 2013.com.canonical.certification::__memory__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__miscellanea__
+ # 2013.com.canonical.certification::__memory__
+ # 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
 2013.com.canonical.certification::miscellanea/oops_results.log
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__networking__
- # See Automated Tests section at the end of this file
+ # 2013.com.canonical.certification::__networking__
 2013.com.canonical.certification::ethernet/detect certification-status=blocker
 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
- 2013.com.canonical.certification::networking/info certification-status=blocker
- 2013.com.canonical.certification::networking/info_eth\d
- 2013.com.canonical.certification::networking/info_wlan\d
+ 2013.com.canonical.certification::networking/info.*
 2013.com.canonical.certification::networking/ntp certification-status=blocker
- 2013.com.canonical.certification::__power-management__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::power-management/generator_.*
- 2013.com.canonical.certification::power-management/lid certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
- 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ # 2013.com.canonical.certification::__power-management__
 2013.com.canonical.certification::power-management/rtc certification-status=blocker
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
- 2013.com.canonical.certification::power-management/poweroff-log-attach
- 2013.com.canonical.certification::power-management/reboot certification-status=blocker
- 2013.com.canonical.certification::power-management/reboot-log-attach
- 2013.com.canonical.certification::__wireless__
+ # 2013.com.canonical.certification::__wireless__
 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_bg certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_bg certification-status=blocker
@@ -102,8 +80,7 @@ include:
 2013.com.canonical.certification::wireless/wireless_connection_open_n certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
- 2013.com.canonical.certification::__suspend__
- 2013.com.canonical.certification::suspend/generator_.*
+ # 2013.com.canonical.certification::__suspend__
 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend certification-status=blocker
@@ -111,6 +88,9 @@ include:
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
 2013.com.canonical.certification::suspend/network_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_detect_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_after_suspend certification-status=blocker
@@ -131,11 +111,17 @@ include:
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
- somerville/suspend-on-AC-power 
+ somerville/suspend-on-AC-power
+ # 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.
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach 
 # 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.
- 2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results_hwe.log.gz 
@@ -143,18 +129,14 @@ include:
 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
 2013.com.canonical.certification::firmware/no_ACPI_REV_interface
 2013.com.canonical.certification::miscellanea/dmitest_client
- 2013.com.canonical.certification::disk/stats
 2013.com.canonical.certification::disk/stats_.*
- 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
- 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
- #Info attachment jobs
- 2013.com.canonical.certification::__info__
+ # Info attachment jobs
+ # 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
 2013.com.canonical.certification::cpuinfo_attachment
 2013.com.canonical.certification::dmesg_attachment
@@ -177,11 +159,15 @@ include:
 2013.com.canonical.certification::lsmod_attachment
 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
- 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
- 2013.com.canonical.certification::info/buildstamp
+bootstrap_include:
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::fwts
+ 2013.com.canonical.certification::graphics_card
 mandatory_include:
- 2013.com.canonical.certification::miscellanea/submission-resources
+ 2013.com.canonical.plainbox::collect-manifest
+ # Meta-job to include required resources, don't remove.
+ 2013.com.canonical.certification::miscellanea/submission-resources