Merge with previous commits

 * Pierre Equoy 2015-10-15 Use of hibernate_advanced to run S4 for the 1st graphic card * Pierre Equoy 2015-10-15 Use the new FWTS generator job for firmware resources * Elsa Wang 2015-10-07 minor fix for Sutton test plans 

14 files changed, 45 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index a567709..a0b66fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+plainbox-provider-oem (0.25) trusty; urgency=medium
+
+ * Use of hibernate_advanced to run S4 for the 1st graphic card (lp:1503586)
+ * New FWTS generator job for firmware resources (lp:1502816)
+ * Sutton test plans update
+ * Somerville test plans update
+ * Debian control file updated to fix typo 
+
+ -- Pierre Equoy <pierre.equoy@canonical.com> Thu, 15 Oct 2015 10:58:04 +0800
+
 plainbox-provider-oem (0.24) trusty; urgency=medium
 
 * 1. add stella-cli, somerville-cli, somerville-oem-cli, sutton-cli
@@ -244,7 +254,7 @@ plainbox-provider-oem (0.1ubuntu38) trusty; urgency=medium
 
 * Add Kittyhawk2.0 provider, Test cases & Whitelists
 
- -- Vanessa <vanessa@vanessa> Mon, 19 Jan 2015 11:47:35 +0800
+ -- Vanessa <vanessa.chang@canonical.com> Mon, 19 Jan 2015 11:47:35 +0800
 
 plainbox-provider-oem (0.1ubuntu37) trusty; urgency=low
 
diff --git a/debian/control b/debian/control
index fa531ab..4a28560 100644
--- a/debian/control
+++ b/debian/control
@@ -18,33 +18,33 @@ Package: plainbox-provider-oem
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, plainbox-provider-checkbox, plainbox-insecure-policy
 Description: plainbox oem provider
- plainbox oem provider
+ Plainbox OEM provider to run OEM-specific jobs and test plans
 
 Package: plainbox-provider-oem-sutton
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, checkbox-gui, plainbox-provider-oem (= ${source:Version})
 Conflicts: plainbox-provider-oem-kittyhawk, plainbox-provider-oem-somerville, plainbox-provider-oem-stella
 Description: plainbox oem provider for sutton
- plainbox oem provider for sutton
+ Plainbox OEM provider to run OEM-specific jobs and test plans (Sutton)
 
 Package: plainbox-provider-oem-kittyhawk
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, checkbox-gui, plainbox-provider-oem (= ${source:Version})
 Conflicts: plainbox-provider-oem-sutton, plainbox-provider-oem-somerville, plainbox-provider-oem-stella
 Description: plainbox oem provider for kittyhawk
- plainbox oem provider for kittyhawk
+ Plainbox OEM provider to run OEM-specific jobs and test plans (KittyHawk)
 
 Package: plainbox-provider-oem-stella
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, checkbox-gui, plainbox-provider-oem (= ${source:Version})
 Conflicts: plainbox-provider-oem-kittyhawk, plainbox-provider-oem-sutton, plainbox-provider-oem-somerville
 Description: plainbox oem provider for stella
- plainbox oem provider for stella
+ Plainbox OEM provider to run OEM-specific jobs and test plans (Stella)
 
 Package: plainbox-provider-oem-somerville
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, checkbox-gui, plainbox-provider-oem (= ${source:Version})
 Conflicts: plainbox-provider-oem-kittyhawk, plainbox-provider-oem-sutton, plainbox-provider-oem-stella
 Description: plainbox oem provider for somerville
- plainbox oem provider for somerville
+ Plainbox OEM provider to run OEM-specific jobs and test plans (Somerville)
 
diff --git a/units/somerville-BIOS.pxu b/units/somerville-BIOS.pxu
index c8eca38..5270e14 100644
--- a/units/somerville-BIOS.pxu
+++ b/units/somerville-BIOS.pxu
@@ -397,8 +397,8 @@ include:
 2013.com.canonical.certification::suspend/led_after_suspend/wlan-disabled
 2013.com.canonical.certification::suspend/led_after_suspend/hdd
 2013.com.canonical.certification::suspend/led_after_suspend/touchpad
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::keys/hibernate certification-status=blocker
 # 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
@@ -411,6 +411,7 @@ 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
diff --git a/units/somerville-cert-14-04-3.pxu b/units/somerville-cert-14-04-3.pxu
index 71f09f5..fc1c49e 100644
--- a/units/somerville-cert-14-04-3.pxu
+++ b/units/somerville-cert-14-04-3.pxu
@@ -368,8 +368,8 @@ include:
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_n certification-status=blocker
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_wpa_ac certification-status=blocker
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_ac certification-status=blocker
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::keys/hibernate certification-status=blocker
 # 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
@@ -382,6 +382,7 @@ 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
diff --git a/units/somerville-full.pxu b/units/somerville-full.pxu
index bbe363d..6bbc263 100644
--- a/units/somerville-full.pxu
+++ b/units/somerville-full.pxu
@@ -428,8 +428,8 @@ include:
 2013.com.canonical.certification::suspend/led_after_suspend/wlan-disabled
 2013.com.canonical.certification::suspend/led_after_suspend/hdd
 2013.com.canonical.certification::suspend/led_after_suspend/touchpad
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::keys/hibernate 
 somerville/suspend-power-menu
 somerville/suspend-power-button
@@ -440,6 +440,7 @@ include:
 # 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_hwe
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log.gz 
diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index c66863b..d91080f 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -184,8 +184,8 @@ include:
 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
 2013.com.canonical.certification::suspend/memory_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/keys_after_suspend/video-out
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
@@ -193,8 +193,7 @@ include:
 # 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/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 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 
diff --git a/units/somerville-touch-webcam.pxu b/units/somerville-touch-webcam.pxu
index 8c2104d..5ca0cb9 100644
--- a/units/somerville-touch-webcam.pxu
+++ b/units/somerville-touch-webcam.pxu
@@ -125,8 +125,8 @@ include:
 2013.com.canonical.certification::suspend/keys_after_suspend/touchpad
 2013.com.canonical.certification::suspend/led_after_suspend/camera
 2013.com.canonical.certification::suspend/led_after_suspend/touchpad
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
@@ -134,8 +134,7 @@ include:
 # 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/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 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 
diff --git a/units/somerville-wireless.pxu b/units/somerville-wireless.pxu
index a95e901..52e8c6e 100644
--- a/units/somerville-wireless.pxu
+++ b/units/somerville-wireless.pxu
@@ -126,8 +126,8 @@ include:
 2013.com.canonical.certification::suspend/led_after_suspend/bluetooth
 2013.com.canonical.certification::suspend/led_after_suspend/wlan
 2013.com.canonical.certification::suspend/led_after_suspend/wlan-disabled
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
@@ -135,8 +135,7 @@ include:
 # 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/fwts
- 2013.com.canonical.certification::firmware/fwts_logs
+ 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 
diff --git a/units/stella-full-14-04-3.pxu b/units/stella-full-14-04-3.pxu
index bf760dc..20addf0 100644
--- a/units/stella-full-14-04-3.pxu
+++ b/units/stella-full-14-04-3.pxu
@@ -103,6 +103,7 @@ include:
 #__firmware__
 # firmware tests
 2013.com.canonical.certification::__firmware__
+ 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
@@ -411,8 +412,8 @@ include:
 2013.com.canonical.certification::suspend/video_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::keys/sleep certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
diff --git a/units/stella-full.pxu b/units/stella-full.pxu
index 2c85810..b67e344 100644
--- a/units/stella-full.pxu
+++ b/units/stella-full.pxu
@@ -97,6 +97,7 @@ include:
 #floppy/check_fd\d
 # firmware tests
 2013.com.canonical.certification::__firmware__
+ 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
diff --git a/units/stella-graphics.pxu b/units/stella-graphics.pxu
index 6981e8b..d0f0bbb 100644
--- a/units/stella-graphics.pxu
+++ b/units/stella-graphics.pxu
@@ -166,8 +166,8 @@ include:
 2013.com.canonical.certification::suspend/suspend-single-log-attach
 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::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/driver_version_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
diff --git a/units/sutton-full-14-04-3.pxu b/units/sutton-full-14-04-3.pxu
index 58e78cd..021a82c 100644
--- a/units/sutton-full-14-04-3.pxu
+++ b/units/sutton-full-14-04-3.pxu
@@ -261,7 +261,6 @@ 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/wireless_scanning certification-status=blocker
@@ -369,8 +368,8 @@ include:
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_n certification-status=blocker
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_wpa_ac certification-status=blocker
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_ac certification-status=blocker
- 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
- 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 #2013.com.canonical.certification::keys/hibernate certification-status=blocker
 # 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
@@ -383,6 +382,7 @@ 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
diff --git a/units/sutton-full-14-04.pxu b/units/sutton-full-14-04.pxu
index 85e2c44..8b1ec01 100644
--- a/units/sutton-full-14-04.pxu
+++ b/units/sutton-full-14-04.pxu
@@ -250,7 +250,6 @@ 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/wireless_scanning certification-status=blocker
@@ -372,6 +371,7 @@ 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
diff --git a/whitelists/oem-common.whitelist b/whitelists/oem-common.whitelist
index 64c6737..55934e7 100644
--- a/whitelists/oem-common.whitelist
+++ b/whitelists/oem-common.whitelist
@@ -425,8 +425,7 @@
 # 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/fwts
-2013.com.canonical.certification::firmware/fwts_logs
+2013.com.canonical.certification::firmware/generator_.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
 2013.com.canonical.certification::firmware/fwts_wakealarm