14 files changed, 220 insertions, 92 deletions
diff --git a/debian/changelog b/debian/changelog
index 215125f..8d63049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-plainbox-provider-oem (0.1ubuntu6) trusty; urgency=medium
-
- * move job form stella folder to job folder, update stella-laptop-
- full.whitelist
-
- -- Betty Lin <betty.lin@canonical.com> Wed, 30 Apr 2014 17:33:19 +0800
-
 plainbox-provider-oem (0.1ubuntu5) trusty; urgency=high
 
 * add somerville provider
diff --git a/jobs/main.txt.in b/jobs/main.txt.in
index 88d105e..1a811f6 100644
--- a/jobs/main.txt.in
+++ b/jobs/main.txt.in
@@ -4,36 +4,7 @@ command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/misc/misc.txt*
 _description: Miscellaneous
 
 plugin: local
-id: st-account
-command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/st-account.txt*
-_description: stella account test
+id: stella
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/stella.txt*
+_description: stella specific
 
-plugin: local
-id: st-hp-particular
-command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/st-hp-particular.txt*
-_description: stella specific test case
-
-plugin: local
-id: st-third-party-addon
-command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/st-third-party-addon.txt*
-_description: third-party releated test case
-
-plugin: local
-id: st-hotkeys
-command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/st-hotkeys.txt*
-_description: Stella hotkey releated test case
-
-plugin: local
-id: st-energy-star-compliant
-command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/st-energy-star-compliant.txt*
-_description: Stella energy star releated test case
-
-plugin: local
-id: st-vdt-sourcelist
-command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/st-vdt-sourcelist.txt*
-_description: Stella vdt source list test
-
-plugin: local
-id: st-vnb-sourcelist
-command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/st-vnb-sourcelist.txt*
-_description: Stella vdt source list test
diff --git a/jobs/stella/Enable-Disable-In-Active-For-Stress.txt.in b/jobs/stella/Enable-Disable-In-Active-For-Stress.txt.in
new file mode 100644
index 0000000..2177b8d
--- /dev/null
+++ b/jobs/stella/Enable-Disable-In-Active-For-Stress.txt.in
@@ -0,0 +1,24 @@
+plugin: shell
+id: stella/Enable-Disable-In-Active-Sleep-For-Stress/Disable-In-Active-AC
+command:
+ gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type nothing
+_description: To disable In-Active in AC mode
+
+plugin: shell
+id: stella/Enable-Disable-In-Active-Sleep-For-Stress/Disable-In-Active-Battery
+command:
+ gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-battery-type nothing
+_description: To disable In-Active in battery mode
+
+plugin: shell
+id: stella/Enable-Disable-In-Active-Sleep-For-Stress/Enable-In-Active-AC
+command:
+ gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type suspend
+_description: To enable In-Active in AC mode
+
+plugin: shell
+id: stella/Enable-Disable-In-Active-Sleep-For-Stress/Enable-In-Active-Battery
+command:
+ gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-battery-type suspend
+_description: To enable In-Active in battery mode
+
diff --git a/jobs/stella/New-test.txt.in b/jobs/stella/New-test.txt.in
new file mode 100644
index 0000000..aa28afd
--- /dev/null
+++ b/jobs/stella/New-test.txt.in
@@ -0,0 +1,12 @@
+plugin: manual
+id: stella/hotkeys/new_job_1
+_description:
+ PURPOSE:
+ 1. (Write here test purpose)
+ STEPS:
+ 1. (Write here test execution procedure step by step)
+ VERIFICATION:
+ 1. (Write here test verification procedure step by step)
+ NOTES:
+ 1. (Add here optional notes or remove the whole section)
+
diff --git a/jobs/st-account.txt.in b/jobs/stella/account.txt.in
index 5ecaa6e..4a51b3d 100644
--- a/jobs/st-account.txt.in
+++ b/jobs/stella/account.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-id: st-account/switch-to-guest-session
+id: stella/account/switch-to-guest-session
 _description:
 PURPOSE:
 1. To verify change user session function
diff --git a/jobs/st-energy-star-compliant.txt.in b/jobs/stella/energy-star-compliant.txt.in
index bb00e3a..231db2d 100644
--- a/jobs/st-energy-star-compliant.txt.in
+++ b/jobs/stella/energy-star-compliant.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-id: st-energy-star-compliant/NB-suspend-on-battery-power
+id: stella/energy-star-compliant-NB/suspend-on-battery-power
 _description:
 PURPOSE:
 Verify system can enter suspend after idle for 10 minutes on battery power
@@ -11,7 +11,7 @@ _description:
 System will turn off blacklight and suspend after 10 minutes
 
 plugin: manual
-id: st-energy-star-compliant/NB-suspend-on-AC-power
+id: stella/energy-star-compliant-NB/suspend-on-AC-power
 _description:
 PURPOSE:
 Verify system can enter suspend after idle for 30 minutes on AC power
@@ -23,7 +23,7 @@ _description:
 System will turn off blacklight after 10 minutes first and then go to suspend after 20 minutes. (Total 30 minutes)
 
 plugin: manual
-id: st-energy-star-compliant/DT-suspend-when-inactive
+id: stella/energy-star-compliant-DT/suspend-when-inactive
 _description:
 PURPOSE:
 Verify system can enter suspend after idle for 20 minutes on AC power
diff --git a/jobs/st-hotkeys.txt.in b/jobs/stella/hotkeys.txt.in
index ed262cb..35631a4 100644
--- a/jobs/st-hotkeys.txt.in
+++ b/jobs/stella/hotkeys.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-id: st-hotkeys/help
+id: stella/hotkeys/help
 _description:
 PURPOSE:
 Th‎is test will test hotkey F1 for "Ubuntu Desktop Guide"
diff --git a/jobs/st-hp-particular.txt.in b/jobs/stella/hp-particular.txt.in
index 1e56651..205717f 100644
--- a/jobs/st-hp-particular.txt.in
+++ b/jobs/stella/hp-particular.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-id: st-hp-particular/hp-documents
+id: stella/hp-particular/hp-documents
 _description:
 PURPOSE:
 Verify HP documents is available
@@ -11,8 +11,8 @@ _description:
 2. There should be two tabs on Firefox and perform HP User Guides
 3. Check language of HP User Guides is correct
 
-plugin: user-interact-verify
-id: st-hp-particular/build_valid_check
+plugin: manual
+id: stella/hp-particular/build_valid_check
 command: bash ${PLAINBOX_PROVIDER_DATA}/../scripts/stella_compatibilityChecker -r
 _description:
 PURPOSE:
diff --git a/jobs/stella/recovery.txt.in b/jobs/stella/recovery.txt.in
new file mode 100644
index 0000000..a41db95
--- /dev/null
+++ b/jobs/stella/recovery.txt.in
@@ -0,0 +1,76 @@
+plugin: manual
+id: stella/recovery/recovery-launch-in-legacy
+_description:
+ PURPOSE:
+ Verify press F11 key can launch system recovery in Legacy mode
+ STEPS:
+ 1. Power system or Reboot system
+ 2. Press F11 key during while system booting up
+ VERIFICATION:
+ System can enter Recovery mode
+
+plugin: manual
+id: stella/recovery/recovery-system-in-legacy
+_description:
+ PURPOSE:
+ Verify system recovery can be completed without problem in Legacy mode
+ STEPS:
+ 1. Press F11 key to enter recovery mode
+ 2. Follow the steps to perform system recovery
+ VERIFICATION:
+ System recovery can be completed without problem
+
+plugin: manual
+id: stella/recovery/cancel-system-recovery-in-legacy
+_description:
+ PURPOSE:
+ Verify system still can enter recovery mode after recovery system be cancelled in Legacy mode
+ STEPS:
+ 1. Press F11 key to enter recovery mode
+ 2. Follow the steps to perform system recovery
+ 3. Power off the system during system recoverying
+ 4. Power on system again
+ 5. Press F11 key to enter recovery mode
+ VERIFICATION:
+ System can enter recovery mode without problem
+ NOTES:
+ This test is to make sure recovery partition won't be crashed while power loss during recoverying
+
+plugin: manual
+id: stella/recovery/recovery-launch-in-UEFI
+_description:
+ PURPOSE:
+ Verify press F11 key can launch system recovery in UEFI mode
+ STEPS:
+ 1. Power system or Reboot system
+ 2. Press F11 key during while system booting up
+ VERIFICATION:
+ System can enter Recovery mode
+
+plugin: manual
+id: stella/recovery/recovery-system-in-UEFI
+_description:
+ PURPOSE:
+ Verify system recovery can be completed without problem in UEFI mode
+ STEPS:
+ 1. Press F11 key to enter recovery mode
+ 2. Follow the steps to perform system recovery
+ VERIFICATION:
+ System recovery can be completed without problem
+
+plugin: manual
+id: stella/recovery/cancel-system-recovery-in-UEFI
+_description:
+ PURPOSE:
+ Verify system still can enter recovery mode after recovery system be cancelled in UEFI mode
+ STEPS:
+ 1. Press F11 key to enter recovery mode
+ 2. Follow the steps to perform system recovery
+ 3. Power off the system during system recoverying
+ 4. Power on system again
+ 5. Press F11 key to enter recovery mode
+ VERIFICATION:
+ System can enter recovery mode without problem
+ NOTES:
+ This test is to make sure recovery partition won't be crashed while power loss during recoverying
+
diff --git a/jobs/stella/stella.txt.in b/jobs/stella/stella.txt.in
new file mode 100644
index 0000000..c407e67
--- /dev/null
+++ b/jobs/stella/stella.txt.in
@@ -0,0 +1,46 @@
+plugin: local
+id: stella/energy-star-compliant
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/energy-star-compliant.txt*
+_description: Energy Star Compliant
+
+plugin: local
+id: stella/hotkeys
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/hotkeys.txt*
+_description: Additional hotkeys verification
+
+plugin: local
+id: stella/hp-particular
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/hp-particular.txt*
+_description: Verify some particular features for HP
+
+plugin: local
+id: stella/recovery
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/recovery.txt*
+_description: Recovery feature verification
+
+plugin: local
+id: stella/third-party-addon
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/third-party-addon.txt*
+_description: Thrid party add-on verification
+
+plugin: local
+id: stella/account
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/account.txt*
+_description: User account functions
+
+plugin: local
+id: stella/vnb-sourcelist
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/vnb-sourcelist.txt*
+_description: Check Stella vNB sourceslist
+
+plugin: local
+id: stella/vdt-sourcelist
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/vdt-sourcelist.txt*
+_description: Check Nagoya sourcelist
+
+plugin: local
+id: stella/Enable-Disable-In-Active-Sleep-For-Stress
+command:
+ cat ${PLAINBOX_PROVIDER_DATA}/../jobs/stella/Enable-Disable-In-Active-For-Stress.txt*
+_description: To disable/enable In-Actvie function during stress test
+
diff --git a/jobs/st-third-party-addon.txt.in b/jobs/stella/third-party-addon.txt.in
index f65c2f0..0e7c26a 100644
--- a/jobs/st-third-party-addon.txt.in
+++ b/jobs/stella/third-party-addon.txt.in
@@ -1,5 +1,5 @@
-plugin: user-interact-verify
-id: st-third-party-addon/Adobe-flash
+plugin: manual
+id: stella/third-party-addon/Adobe-flash
 command: xdg-open http://www.adobe.com/tw/support/flashplayer/ts/documents/tn_15507.htm
 _description:
 PURPOSE:
@@ -10,7 +10,7 @@ _description:
 The website will let you know that Adobe-flash is intalled or not.
 
 plugin: manual
-id: st-third-party-addon/Java
+id: stella/third-party-addon/Java
 _description:
 PURPOSE:
 1. To validate that Java runtime plugin is installed by default
@@ -21,13 +21,13 @@ _description:
 The page should refresh and display your environment within 10-60 sec.
 
 plugin: shell
-id: st-third-party-addon/check-mp3-codec-installed
+id: stella/third-party-addon/check-mp3-codec-installed
 command:
 if [ "`dpkg -L gstreamer0.10-fluendo-mp3 | grep gstreamer0.10-fluendo-mp3`" ]; then echo "gstreamer0.10-fluendo-mp3 is existed"; exit 0; else echo "gstreamer0.10-fluendo-mp3 is not existed"; exit 1; fi
 _description: Check fluendo mp3 codec is installed in system
 
-plugin: user-interact-verify
-id: st-third-party-addon/check-Hanyi-font-installed
+plugin: manual
+id: stella/third-party-addon/check-Hanyi-font-installed
 command:
 if [ "`dpkg -L ttf-hanyi | grep ttf-hanyi`" ]; then echo "ttf-hanyi is existed"; exit 0; else echo "ttf-hanyi is not existed"; exit 1; fi
 _description:
@@ -39,8 +39,8 @@ _description:
 The verification of this test is automated. Do not change the
 automatically selected result.
 
-plugin: user-interact-verify
-id: st-third-party-addon/Unity-mode-default3d
+plugin: manual
+id: stella/third-party-addon/Unity-mode-default3d
 command: bash ${PLAINBOX_PROVIDER_DATA}/../scripts/stella_unity_2d3d_check
 _description:
 PURPOSE:
diff --git a/jobs/st-vdt-sourcelist.txt.in b/jobs/stella/vdt-sourcelist.txt.in
index 2773aa2..a2a13f7 100644
--- a/jobs/st-vdt-sourcelist.txt.in
+++ b/jobs/stella/vdt-sourcelist.txt.in
@@ -1,35 +1,35 @@
 plugin: shell
-id: st-vdt-sourcelist/nagoya-repository
+id: stella/vdt-sourcelist/nagoya-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-nagoya.list "deb http://hp.archive.canonical.com/updates precise-stella-nagoya public"
 _description: Check Nagoya repository
 
 plugin: shell
-id: st-vdt-sourcelist/oem-sp1-repository
+id: stella/vdt-sourcelist/oem-sp1-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-oem-sp1.list "deb http://oem.archive.canonical.com/updates/ precise-oem-sp1 public"
 _description: Check OEM SP1 repository
 
 plugin: shell
-id: st-vdt-sourcelist/dali-repository
+id: stella/vdt-sourcelist/dali-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-dali.list "deb http://hp.archive.canonical.com/updates precise-stella-dali public"
 _description: Check Dali repository
 
 plugin: shell
-id: st-vdt-sourcelist/fuli-repository
+id: stella/vdt-sourcelist/fuli-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-fuli.list "deb http://hp.archive.canonical.com/updates precise-stella-fuli public"
 _description: Check Fuli repository
 
 plugin: shell
-id: st-vdt-sourcelist/oem-sp2-repository
+id: stella/vdt-sourcelist/oem-sp2-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-oem-sp2.list "deb http://oem.archive.canonical.com/updates/ precise-oem-sp2 public"
 _description: Check OEM SP2 repository
 
 plugin: shell
-id: st-vdt-sourcelist/jiali-repository
+id: stella/vdt-sourcelist/jiali-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-jiali.list "deb http://hp.archive.canonical.com/updates precise-stella-jiali public"
 _description: Check Jiali repository
diff --git a/jobs/st-vnb-sourcelist.txt.in b/jobs/stella/vnb-sourcelist.txt.in
index 4fcf9ef..9c5a5f9 100644
--- a/jobs/st-vnb-sourcelist.txt.in
+++ b/jobs/stella/vnb-sourcelist.txt.in
@@ -1,41 +1,41 @@
 plugin: shell
-id: st-vnb-sourcelist/anaheim-repository
+id: stella/vnb-sourcelist/anaheim-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-anaheim.list "deb http://hp.archive.canonical.com/updates precise-stella-anaheim public" 
 _description: Check Anaheim repository
 
 plugin: shell
-id: st-vnb-sourcelist/oem-sp1-repository
+id: stella/vnb-sourcelist/oem-sp1-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-oem-sp1.list "deb http://oem.archive.canonical.com/updates/ precise-oem-sp1 public"
 _description: Check OEM SP1 repository
 
 plugin: shell
-id: st-vnb-sourcelist/puli-repository
+id: stella/vnb-sourcelist/puli-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-puli.list "deb http://hp.archive.canonical.com/updates precise-stella-puli public"
 _description: Check Puli repository
 
 plugin: shell
-id: st-vnb-sourcelist/yuli-repository
+id: stella/vnb-sourcelist/yuli-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-yuli.list "deb http://hp.archive.canonical.com/updates precise-stella-yuli public"
 _description: Check Yuli repository
 
 plugin: shell
-id: st-vnb-sourcelist/yuanli-repository
+id: stella/vnb-sourcelist/yuanli-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-yuanli.list "deb http://hp.archive.canonical.com/updates precise-stella-yuanli public"
 _description: Check Yuanli repository
 
 plugin: shell
-id: st-vnb-sourcelist/oem-sp2-repository
+id: stella/vnb-sourcelist/oem-sp2-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-oem-sp2.list "deb http://oem.archive.canonical.com/updates/ precise-oem-sp2 public"
 _description: Check OEM SP2 repository
 
 plugin: shell
-id: st-vnb-sourcelist/daan-repository
+id: stella/vnb-sourcelist/daan-repository
 command:
 sources_test /etc/apt/sources.list.d/precise-stella-daan.list "deb http://hp.archive.canonical.com/updates precise-stella-daan public"
 _description: Check Daan repository
diff --git a/whitelists/stella-laptop-full.whitelist b/whitelists/stella-laptop-full.whitelist
index 148f3ae..09d45f5 100644
--- a/whitelists/stella-laptop-full.whitelist
+++ b/whitelists/stella-laptop-full.whitelist
@@ -1,5 +1,5 @@
 ## Common Whitelist for OEM projects
-## Rev 1.0, 2014-04-30
+## Rev 1.2, 2013-01-21
 ## Based on checkbox 0.15.1, checkbox-certification 0.15 checkbox-oem 0.45
 ## http://bit.ly/V8uMmF
 
@@ -391,15 +391,15 @@
 2013.com.canonical.certification::miscellanea/fwts_test
 2013.com.canonical.certification::miscellanea/fwts_results.log
 #miscellanea/sources-list
-#2013.com.canonical.certification::power-management/suspend_30_cycles
-#2013.com.canonical.certification::power-management/suspend-30-cycles-log-check
-#2013.com.canonical.certification::power-management/suspend-30-cycle-log-attach
-#2013.com.canonical.certification::power-management/suspend-30-cycles-time-check
-#2013.com.canonical.certification::power-management/hibernate_30_cycles
-#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/cpu_stress_test
+2013.com.canonical.certification::power-management/suspend_30_cycles
+2013.com.canonical.certification::power-management/suspend-30-cycles-log-check
+2013.com.canonical.certification::power-management/suspend-30-cycle-log-attach
+2013.com.canonical.certification::power-management/suspend-30-cycles-time-check
+2013.com.canonical.certification::power-management/hibernate_30_cycles
+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/cpu_stress_test
 #stress/reboot
 #stress/reboot_log
 #stress/poweroff
@@ -434,17 +434,23 @@
 2013.com.canonical.certification::info/xrandr
 2013.com.canonical.certification::info/disk_partitions
 
-#stella
-2014.com.canonical.ce::st-energy-star-compliant-NB/suspend-on-AC-power
-2014.com.canonical.ce::st-energy-star-compliant-NB/suspend-on-battery-power
-2014.com.canonical.ce::st-hotkeys/help
-2014.com.canonical.ce::st-account/switch-to-guest-session
-2014.com.canonical.ce::st-hp-particular/hp-documents
-2014.com.canonical.ce::st-hp-particular/build_valid_check
-2014.com.canonical.ce::st-third-party-addon/Adobe-flash
-2014.com.canonical.ce::st-third-party-addon/check-mp3-codec-installed
-2014.com.canonical.ce::st-third-party-addon/check-Hanyi-font-installed
-2014.com.canonical.ce::st-third-party-addon/Unity-mode-default3d
-2014.com.canonical.ce::st-vnb-sourcelist/oem-sp1-repository
-2014.com.canonical.ce::st-vnb-sourcelist/oem-sp2-repository
-2014.com.canonical.ce::st-vnb-sourcelist/daan-repository
+stella
+stella/energy-star-compliant
+stella/energy-star-compliant-NB/suspend-on-AC-power
+stella/energy-star-compliant-NB/suspend-on-battery-power
+stella/hotkeys
+stella/hotkeys/help
+stella/account
+stella/account/switch-to-guest-session
+stella/hp-particular
+stella/hp-particular/hp-documents
+stella/hp-particular/build_valid_check
+stella/third-party-addon
+stella/third-party-addon/Adobe-flash
+stella/third-party-addon/check-mp3-codec-installed
+stella/third-party-addon/check-Hanyi-font-installed
+stella/third-party-addon/Unity-mode-default3d
+stella/vnb-sourcelist
+stella/vnb-sourcelist/oem-sp1-repository
+stella/vnb-sourcelist/oem-sp2-repository
+stella/vnb-sourcelist/daan-repository