Update Somerville-cli & Whitelist

9 files changed, 331 insertions, 605 deletions

diff --git a/jobs/somerville/somerville.txt.in b/jobs/somerville/somerville.txt.in
index c14e593..33d9a67 100644
--- a/jobs/somerville/somerville.txt.in
+++ b/jobs/somerville/somerville.txt.in
@@ -1,5 +1,10 @@
-plugin: manual
+unit: category
+id: somerville
+_name: somerville tests
+
 id: somerville/phase-sku
+category_id: somerville
+plugin: manual
 _description:
 PURPOSE:
 1. Add hardware system code to report
@@ -10,8 +15,9 @@ _description:
 VERIFICATION:
 1. No verification needed
 
-plugin: shell
 id: somerville/query-bto-version
+category_id: somerville
+plugin: shell
 requires: pkg.name == "dell-recovery"
 command: cat /etc/buildstamp
 user: root
@@ -24,20 +30,17 @@ _description:
 VERIFICATION:
 1. Is the BTO version information correct?
 
-plugin: shell
 id: somerville/query-bto-version-output
+category_id: somerville
+plugin: shell
 requires: pkg.name == "dell-recovery"
 command: cat /etc/buildstamp
 user: root
 _description: Automated test to store the BTO version information
 
-plugin: user-interact-verify
-id: somerville/app-check
-command: open_and_close_applications.py
-_description: Validate that all apps can be launched and closed.
-
-plugin: manual
 id: somerville/update
+category_id: somerville
+plugin: manual
 _description:
 PURPOSE:
 1. Verify the system can install updates successfully
@@ -48,8 +51,9 @@ _description:
 NOTES:
 1. Please perform this test last.
 
-plugin: shell
 id: somerville/manifest_version
+category_id: somerville
+plugin: shell
 command: query_bto_version.py
 user: root
 _description:
@@ -61,57 +65,17 @@ _description:
 VERIFICATION:
 1. No verification needed
 
-plugin: local
 id: somerville/recovery
+category_id: somerville
+plugin: local
 command: cat ${CPLAINBOX_PROVIDER_DATA}/../jobs/recovery.txt*
 _description:
 Dell Recovery
 Please run this test before running Checkbox.
 
-plugin: manual
-id: somerville/image-install
-_description:
- PURPOSE:
- 1. To validate that the base BTO candidate can be installed successfully on representitive systems
- STEPS:
- 1. Create a BTO image based on the beta 1 Ubuntu release.
- 2. Install it on representitive systems.
- 3. Repeat with beta 2 Ubuntu release.
- VERIFICATION:
- 1. Does the install go successfully and the system can boot to desktop after the install?
-
-plugin: manual
-id: somerville/skype
-_description:
- PURPOSE:
- 1. To validate that Skype is functioning with audio and webcam devices.
- STEPS:
- 1. Install Skype via Ubuntu Software Center, if not installed by default.
- 2. Log in Skype. Confirm you can add contacts and save contacts
- 3. Confirm you can edit your preferences
- 4. Confirm you can see which one of your friends are available online
- 5. Make a test call and verify the internal microphone and speakers work
- 6. Test the video and verify the webcam works
- VERIFICATION:
- 1. Have the conditions been met with no adverse effects?
-
-plugin: manual
-id: somerville/yahoo-toolbar
-_description:
- PURPOSE:
- 1. To validate that yahoo toolbar is installed by default in Firefox
- STEPS:
- 1. Install the image and open Firefox
- 2. Perform a search using the Yahoo toolbar search box
- 3. Perform a search using the browser search bar
- 4. Click the Yahoo! logo on the toolbar.
- VERIFICATION:
- 1. Yahoo toolbar should appear and the default home page is http://www.yahoo.com/?fr=dell_lin-home
- 2. In Step 2 and 3, Dell specific settings ('dell_lin') should appear in the search page link.
- 3. The web page should refresh to http://www.yahoo.com/?fr=fptb-dell_lin
-
-plugin: manual
 id: somerville/Serial-Port-onboard
+category_id: somerville
+plugin: manual
 _description:
 PURPOSE:
 1. To verify the on-board serial port driver is install correct.
@@ -131,16 +95,6 @@ _description:
 3. Excute the minicom setting "minicom -s".
 
 plugin: manual
-id: somerville/EULA
-_description:
- PURPOSE:
- 1. To validate that Dell EULA is present during oem-config
- STEPS:
- 1. Install the base image
- VERIFICATION:
- 1. Dell EULA should be present during oem-config
-
-plugin: manual
 id: somerville/super-key-disabled
 _description:
 PURPOSE:
@@ -151,20 +105,6 @@ _description:
 1. There shouldn't be any response from the system after the keystroke.
 
 plugin: manual
-id: somerville/4G-RAM-on-S4-feature
-_description:
- PURPOSE:
- 1. To validate that when system is equipped with more than 4G of RAM, hibernate function is not available.
- STEPS:
- 1. Install the base image on a system with <4G RAM. Check the power menu.
- 2. Install the base image on a system with >= 4G RAM. Check the power menu.
- VERIFICATION:
- 1. Hibernate should be available on the power menu.
- 2. Hibernate should not be available on the power menu.
- NOTES:
- 1. System graphics might take some RAM space, but shouldn't affect the the physical 4G RAM criteria.
-
-plugin: manual
 id: somerville/India-rupee-keyboard-layout
 _description:
 PURPOSE:
@@ -185,65 +125,9 @@ _description:
 VERIFICATION:
 1. There should not be any notification from the update manager.
 
-plugin: manual
-id: somerville/Adobe-Flash-11
-_description:
- PURPOSE:
- 1. To validate that Adobe Flash 11 plugin for 64-bit OS is installed by default
- STEPS:
- 1. After install the image, log in to the desktop and open a web browser to watch videos on youtube.com
- VERIFICATION:
- 1. Videos should be displayed without prompting Adobe flash install.
- NOTES:
- 1. Assuming Adobe Flash is required on youtube.com and HTML5 is not enabled.
-
-plugin: manual
-id: somerville/system-install-in-UEFI
-_description:
- PURPOSE:
- 1. Verify that OS install is successfully using USB key/DVD in UEFI mode
- STEPS:
- 1. Create image recovery USB key and DVD
- 2. Make sure the BIOS of SUT is in UEFI mode
- 3. Install the system using USB key
- 4. Install the system using DVD
- VERIFICATION:
- 1. Install should be successful
- NOTES:
- 1. System install needs to be checked per graphics config. Different recovery media install can be leveraged. I.e., it is not necessary to install via both USB and DVD. One is sufficient, but both media should be checked per platform.
-
-plugin: manual
-id: somerville/swap-partition-in-UEFI
-_description:
- PURPOSE:
- 1. Verify that swap partition is created properly when >2TB HDD and <4GB RAM are installed
- STEPS:
- 1. Install the system image on a system with >2TB HDD and with <4GB RAM. Make sure the BIOS is set in UEFI mode.
- 2. After the install, check the swap partition size
- VERIFICATION:
- 1. The swap partition size should be around 4GB for 2GB RAM, or 2GB for 1GB RAM.
- NOTES:
- 1. This requires BIOS in UEFI mode.
-
-plugin: manual
-id: somerville/ACPI-stress-in-UEFI
-_description:
- PURPOSE:
- 1. Verify S3 and S4 work in UEFI mode with various graphics configs
- STEPS:
- 1. Install fwts and run 30 cycles of S3 and S4.
- VERIFICATION:
- 1. System should run 30 S3 and S4 without problems.
- NOTES:
- 1. Test result can be leveraged from sub-platforms. For example, if you have a dalmore-14 UMA and run ACPI stress on it in UEFI native mode, then we don't need to run UEFI native ACPI stress on the other UMA subplatforms like dalmore-15, etc. Given that there are interactions with graphics cards, we need to run for all graphics configs.
-
-plugin: local
-id: somerville/nanjing
-command: cat ${CPLAINBOX_PROVIDER_DATA}/../jobs/nanjing.txt*
-_description: Somerville 11.10 Nanjing
-
-plugin: manual
 id: somerville/suspend-on-battery-power
+category_id: somerville
+plugin: manual
 _description:
 PURPOSE:
 Verify system can enter suspend after idle for 30 minutes on battery power
@@ -256,8 +140,9 @@ _description:
 1. System will turn screen off after 10 minutes
 2. System will enter suspend mode after 20 minutes
 
-plugin: manual
 id: somerville/suspend-on-AC-power
+category_id: somerville
+plugin: manual
 _description:
 PURPOSE:
 Verify system can enter suspend after idle for 30 minutes on AC power
@@ -270,29 +155,9 @@ _description:
 1. System will turn screen off after 10 minutes
 2. System will enter suspend mode after 20 minutes
 
-plugin: user-interact-verify
-id: somerville/external-Displayport-playback
-imports: from 2013.com.canonical.certification import device
-requires:
- device.category == 'AUDIO'
- pkg.name == 'python-gst0.10'
-command:
- gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'
-_description:
- PURPOSE:
- 1. Display Port audio interface verification
- STEPS:
- 1. Plug an external Display Port device with sound
- 2. Open system sound preferences
- 3. Click on Output and Select Display Port
- 4. Run sound test
- VERIFICATION:
- 1. Did you hear a sound?
- NOTES:
- System cannot distinguish between HDMI and Display Port, so the Display Port might show up as HDMI
-
-plugin: manual
 id: somerville/suspend-power-menu
+category_id: somerville
+plugin: manual
 _description:
 PURPOSE:
 1. Suspend the System from Power Menu & Resume via Power Button
@@ -305,8 +170,9 @@ _description:
 1. Did the system Suspend successfully?
 2. Did the system Resume via Power Button?
 
-plugin: manual
 id: somerville/suspend-power-button
+category_id: somerville
+plugin: manual
 _description:
 PURPOSE:
 1. Suspend and Resume the system via Power Button
@@ -319,71 +185,16 @@ _description:
 1. Did the system Suspend successfully?
 2. Did the system Resume via Power Button?
 
-plugin: user-interact-verify
-id: somerville/external-linein
-command: recording.py
-_description:
- PURPOSE:
- 1. Check that external line in connection works correctly
- STEPS:
- 1. Use a cable to connect the line in port to an external line out source.
- 2. Open system sound preferences, 'Input' tab, select 'Line-in' on the connector list. Click the Test button
- 3. gnome-sound-recorder will be opened
- 4. A three seconds clip will be recorded
- 5. The recorded clip will be played
- VERIFICATION:
- 1. Did you hear your recording?
-
-plugin: manual
-id: somerville/external-lineout
-_description:
- PURPOSE:
- 1. Check that external line out connection works correctly
- STEPS:
- 1. Insert cable to speakers (with built-in amplifiers) on the line out port
- 2. Open system sound preferences, 'Output' tab, select 'Line-out' on the connector list. Click the Test button
- 3. On the system sound preferences, select 'Internal Audio' on the device list and click 'Test Speakers' to check left and right channel
- VERIFICATION:
- 1. Do you hear a sound in the speakers? The internal speakers should *not* be muted automatically
- 2. Do you hear the sound coming out on the corresponding channel?
-
-plugin: shell
 id: somerville/dell-repository
+category_id: somerville
+plugin: shell
 command:
 sources_test /etc/apt/sources.list.d/trusty-dell.list "deb http://dell.archive.canonical.com/updates/ trusty-dell public"
 _description: Check Dell repository
 
-plugin: user-interact-verify
-id: somerville/Unity-mode-default3d
-command: unity_2d3d_check
-_description:
- PURPOSE:
- 1. Check if default desktop session is set to 3D
- STEPS:
- 1. Make sure you are logged in to the default desktop session
- 2. Press Test button to run 2D/3D check
- VERIFICATION:
- 1. Output of test result should say user is logged into "ubuntu" session (3D mode)
- 2. Output of test result should say session is running in "ubuntu" (3D mode)
- 3. Output of test result should say that the expected and actual running session MATCHES
-
-plugin: user-interact-verify
-id: somerville/Unity-mode-2d
-command: unity_2d3d_check
-_description:
- PURPOSE:
- 1. Check if 2D desktop session is correctly set
- STEPS:
- 1. Log out of the current desktop session
- 2. Log in to 2D desktop session
- 3. Press Test button to run 2D/3D check
- VERIFICATION:
- 1. Output of test result should say user is logged into "ubuntu-2d" session (2D mode)
- 2. Output of test result should say session is running in "ubuntu-2d" (2D mode)
- 3. Output of test result should say that the expected and actual running session MATCHES
-
-plugin: user-interact-verify
 id: somerville/amd-graphics-mode-default-value
+category_id: somerville
+plugin: user-interact-verify
 requires: pkg.name == 'fglrx' 
 command: aticonfig --px-list-active-gpu
 _description:
diff --git a/scripts/somerville-cli b/scripts/somerville-cli
index 8d50c02..a5f639e 100755
--- a/scripts/somerville-cli
+++ b/scripts/somerville-cli
@@ -1,22 +1,9 @@
-#!/usr/bin/env checkbox-launcher
-[welcome]
-text = Welcome to Canonical System Testing!
- This application will gather information from your system. Then you will be
- asked manual tests to confirm that the system is working properly. Finally,
- you will be asked for the Secure ID of the computer to submit the
- information to the certification.canonical.com database.
- To learn how to create or locate the Secure ID, please see here:
- https://certification.canonical.com/
+#!/usr/bin/env checkbox-cli
 
-[suite]
-# Whitelist(s) displayed in the suite selection screen
-whitelist_filter = ^somerville.*$
-# Whitelist(s) pre-selected in the suite selection screen, default whitelist(s)
-# "bogus" means no whitelist will be preselected.
-whitelist_selection = ^bogus$
+[launcher]
+launcher_version = 1
+app_id = 2016.com.canonical.certification:somerville-testing
 
-[submission]
-submit_to_hexr = true
-
-[transport]
-submit_to = certification
+[test plan]
+filter = *somerville*
+unit = 2014.com.canonical.ce::somerville-full
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