update kittyhawk testcases and whitelists

24 files changed, 644 insertions, 298 deletions

diff --git a/jobs/kittyhawk/baseOS.txt.in b/jobs/kittyhawk/baseOS.txt.in
index e17e81b..13edc45 100644
--- a/jobs/kittyhawk/baseOS.txt.in
+++ b/jobs/kittyhawk/baseOS.txt.in
@@ -58,7 +58,7 @@ _description: To check power management settings are e-star compliant
 plugin: local
 id: kittyhawk/baseOS/canonical-poke
 command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/canonical-census.txt*
-_description: Canonical Census feature test
+_description: Canonical Poke Test
 
 plugin: local
 id: kittyhawk/baseOS/secure-boot
@@ -75,3 +75,30 @@ id: kittyhawk/baseOS/chipset-support
 command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/chipset-support.txt*
 _description: Verify that system can support new chipsets
 
+plugin: manual
+id: kittyhawk/baseOS/canonical-oem-keyring
+_description:
+ PURPOSE:
+ 1. Verify that trusted updates are allowed from the overlay archive specific to the OEM project.
+ STEPS:
+ 1. Launch a terminal and execute command "sudo dpkg -l | grep canonical-oem-keyring"
+ 2. Check if the file "/usr/share/keyrings/canonical-oem-archive-keyring.gpg" generated by canonical-oem-keyring exists
+ VERIFICATION:
+ 1. Step 1 should return Info on canonical-oem-keyring
+ 2. the file "/usr/share/keyrings/canonical-oem-archive-keyring.gpg" should exist
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.1.17
+
+plugin: manual
+id: kittyhawk/baseOS/unity-7-custom-scope
+_description:
+ PURPOSE:
+ 1. Verify that Unity 7 custom scopes can be created
+ STEPS:
+ 1. Launch terminal and execute "dpkg -l | grep unity-scope"
+ 2. Check if there are existing installed scopes
+ VERIFICATION:
+ 1. If a list of installed scopes is returned, it means that the scope API works and custom scopes can be created. Count case as passed in this case.
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.19.10
+
diff --git a/jobs/kittyhawk/baseOS/applications.txt.in b/jobs/kittyhawk/baseOS/applications.txt.in
index 428791f..9d331e2 100644
--- a/jobs/kittyhawk/baseOS/applications.txt.in
+++ b/jobs/kittyhawk/baseOS/applications.txt.in
@@ -75,15 +75,18 @@ plugin: manual
 id: kittyhawk/baseOS/applications/ubuntu-tour
 _description:
 PURPOSE:
- 1. Verify Ubuntu Tour is present and can be opened and closed successfully.
- 2. Verify Ubuntu Tour menu does not become unreadable when interrupting a tutorial
+ 1. Make sure that Ubuntu Tour is present and can be opened and closed successfully.
+ 2. Make sure that Ubuntu Tour menu does not become unreadable when interrupting a tutorial
 STEPS:
- 1. Log in, find Ubuntu Tour, open it and close it.
- 2. Open it and select a tutorial and follow the first few prompts
- 3. Click on the 'Back to menu' icon in the lower right of the screen
+ 1. Log in to OS, find Ubuntu Tour, open it and close it.
+ 3. Open it and select a tutorial and follow the first few prompts
+ 4. Click on the 'Back to menu' icon in the lower right of the screen
+ 5. Re-install system and set language to zh_CN during installation process
+ 6. Login to OS and check if Ubuntu tour is automatically run
 VERIFICATION:
- 1. Ubuntu Tour should be installed and can be opened and closed successfully.
+ 1. Ubuntu Tour should be installed and can be opened with default browser and closed successfully.
 2. The "Welcome to the Ubuntu tour!" window appears and all text is readable.
+ 3. In zh_CN locale, the Ubuntu tour is installed and should run locally as a first-run tutorial.
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.9.1
 
@@ -91,7 +94,7 @@ plugin: manual
 id: kittyhawk/baseOS/applications/user-guide
 _description:
 PURPOSE:
- 1. Verify Ubuntu User Guide is present and can be opened and closed successfully.
+ 1. Make sure that Ubuntu User Guide is present and can be opened and closed successfully.
 STEPS:
 1. Log in, find Ubuntu User Guide (Enter 'Help' in Dash), open it and close it.
 2. Launch Ubuntu User Guide again, click through links in the guide
@@ -105,7 +108,7 @@ plugin: manual
 id: kittyhawk/baseOS/applications/sysinfo
 _description:
 PURPOSE:
- 1. Verify Sysinfo GUI tool for users is available
+ 1. Make sure that Sysinfo GUI tool for users is available
 STEPS:
 1. Launch Sysinfo application by input "sysinfo" from Dash search bar
 VERIFICATION:
@@ -132,7 +135,7 @@ plugin: manual
 id: kittyhawk/baseOS/applications/software-center
 _description:
 PURPOSE:
- 1. Verify Software Center for users is available
+ 1. Make sure that Software Center for users is available
 STEPS:
 1. Click Software Center on the Launcher
 VERIFICATION:
@@ -145,7 +148,7 @@ plugin: manual
 id: kittyhawk/baseOS/applications/camera
 _description:
 PURPOSE:
- 1. Verify camera application works
+ 1. Make sure that camera application works
 STEPS:
 1. Launch Dash and search for "Cheese" application
 2. Launch Dash and search for "Camera" application
@@ -164,7 +167,7 @@ plugin: manual
 id: kittyhawk/baseOS/applications/no-ubuntu-one
 _description:
 PURPOSE:
- 1. Verify Ubuntu One should *NOT* auto start on logins
+ 1. Make sure that Ubuntu One should *NOT* auto start on logins
 STEPS:
 1. Make sure user is connected to network and log in after completing oem-config.
 2. Log out and log in.
@@ -206,7 +209,7 @@ _description:
 VERIFICATION:
 1. "unity-webapps-qml" & "unity-webapps-service" should be listed in Step 1
 2. Installation should be successful in Step 2
- 3. The installed app should be launched with default browser and should work correctly in Step 3 & 4
+ 3. The installed app should be launched with webbrowser-app and should work correctly in Step 3 & 4
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.9.6
 
diff --git a/jobs/kittyhawk/baseOS/benchmark.txt.in b/jobs/kittyhawk/baseOS/benchmark.txt.in
index 650ef0c..9c78753 100644
--- a/jobs/kittyhawk/baseOS/benchmark.txt.in
+++ b/jobs/kittyhawk/baseOS/benchmark.txt.in
@@ -9,10 +9,9 @@ _description:
 2. Restart the system to create boot info
 2. Run python script 'boottime.py' to output boot time info & collect bootchart.png from /var/log/bootchart
 VERIFICATION:
- 1. N/A
+ 1. collect bootchart.png from /var/log/bootchart
 NOTES:
- 1. Representative systems: one of HP, Dell and Lenovo Laptop/Desktop/AIO.
- 2. Measure boot time for image under test.
- 3. boottime.py can be download from https://bazaar.launchpad.net/~timchen119/oem-qa-tools/oem-qa-tools-boottime-broken/files
- 4. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.4.6
+ 1. Measure boot time for image under test.
+ 2. boottime.py can be download from https://bazaar.launchpad.net/~timchen119/oem-qa-tools/oem-qa-tools-boottime-broken/files
+ 3. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.4.6
 
diff --git a/jobs/kittyhawk/baseOS/canonical-census.txt.in b/jobs/kittyhawk/baseOS/canonical-census.txt.in
index 93b8ca7..82f30df 100644
--- a/jobs/kittyhawk/baseOS/canonical-census.txt.in
+++ b/jobs/kittyhawk/baseOS/canonical-census.txt.in
@@ -2,19 +2,24 @@ plugin: manual
 id: kittyhawk/baseOS/canonical-poke/send-poke
 _description:
 PURPOSE:
- 1. Verify system sends the following info to the census server: contents of /var/lib/ubuntu_dist_channel (image build), system marketing name (ex. ThinkPad X220), OEM vendor name (ex. Lenovo), distro release (ex. 14.04), the number of times system checks in.
+ 1. Verify that a counter is included in the OEM images that report fields back to Canonical for 'OEM', 'Model', and 'Region'.
 STEPS:
- 1. Use the testing canonistack apache server at IP_Address for testing.
- 2. Add a line to /etc/hosts for IP_Address census.canonical.com
- 3. Run send-census script (sudo /etc/cron.daily/send-poke), use as many different OEM systems as possible
- 4. Login in IP_Address via SSH and use test/password for username/password. Check the /var/log/apache2/access.log
+ 1. make sure internect connection is established ("ping poke.canonical.com" to make sure the following steps will work correctly; Or access website 'poke.canonical.com', the site works correctly if browser shows 'OK'. )
+ 2. launch terminal and execute the following commands one by one
+ 3. "sudo rm -rf /var/lib/send-install-count/" to reset poke logs
+ 4. "ls /etc/cron.daily/send-poke", "ls /etc/cron.weekly/send-poke", "ls /etc/cron.monthly/send-poke" "ls /etc/cron.hourly/send-poke" to check available send-poke cron jobs
+ 5. "sudo /etc/cron.daily/send-poke" to manually send daily poke
+ 6. "sudo /etc/cron.weekly/send-poke" to manually send weekly poke
+ 7. "sudo /etc/cron.monthtly/send-poke" to manually send montly poke
+ 6. check contents of files in /var/lib/send-install-count/
 VERIFICATION:
- 1. Check the server log, it should match the system info
- 2. The format should be like https://pastebin.canonical.com/76680/
+ 1. /etc/cron.[daily, weekly, monthly]/send-poke should exist, /etc/cron.hourly/send-poke should *NOT* in step 4
+ 2. /var/lib/send-install-count/firstrun should be created after 1st manual poke (step 5), content should be the date the first poke is performed, file should "NOT" be updated starting from the 2nd poke (steps 6~ 7 or repeated steps of 5~7)
+ 3. /var/lib/send-install-count/counter should be created with content "1" after step 5, and number will +1 after each repeat of step 5
+ 4. /var/lib/send-install-count/counter-weekly should be created with content "1" after step 6, and number will +1 after each repeat of step 6
+ 5. /var/lib/send-install-count/counter-monthly should be created with content "1" after step 7, and number will +1 after each repeat of step 7
 NOTES:
- 1. This fake apache server will be teared down once Watauga is done. Please contact Technical Lead if you encounter any login issues.
- 2. It's not clear how often the system will send the info to the census server, will manually run the script for now
- 3. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.1.18
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.1.18
 
 plugin: manual
 id: kittyhawk/baseOS/canonical-poke/parsing
diff --git a/jobs/kittyhawk/baseOS/chipset-support.txt.in b/jobs/kittyhawk/baseOS/chipset-support.txt.in
index 53fd1cd..6cc64b9 100644
--- a/jobs/kittyhawk/baseOS/chipset-support.txt.in
+++ b/jobs/kittyhawk/baseOS/chipset-support.txt.in
@@ -2,8 +2,8 @@ plugin: manual
 id: kittyhawk/baseOS/chipset-support/haswell
 _description:
 PURPOSE:
- 1. Verify the image doesn't break anythiing else after including Intel Haswell driver packages
- 2. Verify Haswell packages are installed by default
+ 1. Make sure that the image doesn't break anythiing else after including Intel Haswell driver packages
+ 2. Make sure that Haswell packages are installed by default
 STEPS:
 1. Install the build on a Haswell system and non Haswell system.
 VERIFICATION:
@@ -15,7 +15,7 @@ plugin: manual
 id: kittyhawk/baseOS/chipset-support/broadwell
 _description:
 PURPOSE:
- 1. Verify that system can support Intel Broadwell
+ 1. Make sure that that system can support Intel Broadwell
 STEPS:
 1. Install the build on a Broadwell system and non Broadwell system.
 VERIFICATION:
diff --git a/jobs/kittyhawk/baseOS/core.txt.in b/jobs/kittyhawk/baseOS/core.txt.in
index a752cc6..018e7c0 100644
--- a/jobs/kittyhawk/baseOS/core.txt.in
+++ b/jobs/kittyhawk/baseOS/core.txt.in
@@ -3,7 +3,7 @@ id: kittyhawk/baseOS/core/64bit
 command: uname -m
 _description:
 PURPOSE:
- 1. Verify the image supports 64 bit architecture
+ 1. Verify that the image supports 64 bit architecture
 STEPS:
 1. Is $output (automatically captured) the same as x86_64?
 VERIFICATION:
@@ -28,7 +28,7 @@ plugin: manual
 id: kittyhawk/baseOS/core/UEFI
 _description:
 PURPOSE:
- 1. Verify image can be installed successfully on UEFI systems
+ 1. Verify that image can be installed successfully on UEFI systems
 STEPS:
 1. Set BIOS to boot in UEFI mode.
 2. Install the image.
@@ -76,11 +76,12 @@ _description:
 PURPOSE:
 1. Verify when a OEM 14.04 LTS image is installed, all available updates at time of image generation.
 STEPS:
- 1. Install OEM 14.04 LTS image, run "/usr/lib/update-notifier/apt-check"
+ 1. Install OEM 14.04 LTS image, run "/usr/lib/update-notifier/apt-check", or run "sudo apt-get update && sudo apt-get upgrade"
 VERIFICATION:
- 1. OS image shall include all available updates
+ 1. OS image shall include all available updates, no updates should be installed when running update commands
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.1.15
+ 2. NOTE: Since there are upstream updates almost everyday, there will always be some updates installed after running the update/upgrade command. There is no way to verify this bug
 
 plugin: manual
 id: kittyhawk/baseOS/core/supsend
@@ -116,18 +117,20 @@ plugin: manual
 id: kittyhawk/baseOS/core/hybrid-sleep-verification
 _description:
 PURPOSE:
- 1.Verify that system can suspend to both disk and RAM from the beginning.
+ 1.Verify that system can suspend to both disk and RAM.
 STEPS:
- 1. Open any applicaton or browser
- 2. Press Power menu and select hybrid sleep to sleep the system
- 3. Remove AC adapter and Battery for a while and re-install AC or Battery
- 4. Press Power button to wake up the system
- 5. Press Power button and select the hybrid sleep from the pop-up menu
- 6. Repeat step 3 ~4
+ 1. Open any applicaton or browser
+ 2. Press Power menu and select hybrid sleep to sleep the system
+ 3. Wake system up by pressing power button
+ 4. Let system hybrid sleep again
+ 5. Remove AC adapter and Battery for a while and re-install AC or Battery
+ 6. Press Power button to wake up the system
+ 7. Press Power button and select the hybrid sleep from the pop-up menu
+ 8. Repeat step 3~6
 VERIFICATION:
- 1. Check that the system resumes from the previous session.
- 2. Check that hybrid sleep can be launched from power menu and power button menu
- 3. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.2.3
+ 1. Check that the system resumes from the previous session from s3 (from RAM) in step 3
+ 2. Check that the system resumes from the previous session from s4 (from disk) in step 6
+ 3. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.2.3
 
 plugin: manual
 id: kittyhawk/baseOS/core/cedar-trail-REMOVED
@@ -224,7 +227,7 @@ plugin: manual
 id: kittyhawk/baseOS/core/wireless
 _description:
 PURPOSE:
- 1.Verify user shall have the ability through a Connection Manager to connect to both encrypted and unencrypted Wi-Fi/WLAN connections.
+ 1.Verify that user shall have the ability (through a Connection Manager) to connect to both encrypted and unencrypted Wi-Fi/WLAN connections.
 STEPS:
 1. Click on the Network icon in the panel.
 2. Select a network below the 'Wireless networks' section.
@@ -243,7 +246,7 @@ plugin: manual
 id: kittyhawk/baseOS/core/ethernet
 _description:
 PURPOSE:
- 1.Verify user shall have the ability through a Connection Manager to connect to a ethernet network.
+ 1.Verify that user shall have the ability (through a Connection Manager) to connect to a ethernet network.
 STEPS:
 1. Connect to Ethernet cable
 2. Launch web browser to verify that it's possible to establish an HTTP connection.
@@ -260,7 +263,7 @@ plugin: manual
 id: kittyhawk/baseOS/core/pxe
 _description:
 PURPOSE:
- 1. This provides factory installation compatibility with our certification lab. It allows for mass testion of our OS images for updates, upgrades, etc.
+ 1. Verify installation via a PXE server to provide factory installation compatibility with our certification lab. It allows for mass testion of our OS images for updates, upgrades, etc.
 STEPS:
 1. Install system via PXE and finish OOBE setting
 VERIFICATION:
@@ -287,7 +290,7 @@ id: kittyhawk/baseOS/core/bay-trail-D
 _description:
 PURPOSE:
 1. Verify the image doesn't break anythiing else after including Intel Bay Trail-D driver packages
- 2. Verify Bay Trail-M packages are installed by default
+ 2. Verify Bay Trail-D packages are installed by default
 STEPS:
 1. Install the build on a Bay Trail-D system and non Bay Trail-D system.
 VERIFICATION:
@@ -316,10 +319,8 @@ _description:
 STEPS:
 1. Install image
 2. launch a text console and execute command "cat /etc/apt/sources.list.d/trusty-oem.list"
- 3. execute command "dpkg -l | grep kittyhawk"
 VERIFICATION:
 1. if output of command in step 2 is "deb http://oem.archive.canonical.com/updates/ trusty-oem public" "deb-src http://oem.archive.canonical.com/updates/ trusty-oem public" then test case passed
- 2. if output of command in step 3 is not empty then test case passed
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.1.20, #1.14.2
 
diff --git a/jobs/kittyhawk/baseOS/graphics.txt.in b/jobs/kittyhawk/baseOS/graphics.txt.in
index 3644aa1..dd361d8 100644
--- a/jobs/kittyhawk/baseOS/graphics.txt.in
+++ b/jobs/kittyhawk/baseOS/graphics.txt.in
@@ -42,11 +42,10 @@ _description:
 PURPOSE:
 1. Verify that gfx card name should be displayed in System Settings
 STEPS:
- 1. Launch sysinfo by entering sysinfo in Dash
- 2. Go to Hardware tab > select Graphc card in drop-down list at upper-right side of sysinfo panel
- 3. Expand the "VGA compatible controller" items
+ 1. Go to System Settings > Details
+ 2. Check if correct graphic card name is listed in "Graphics" column
 VERIFICATION:
- 1. gfx card name should be displayed
+ 1. Correct gfx card name should be displayed
 NOTES:
 1. Should be tested on at I+A, I+N & A+A and UMA platforms
 2. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.11
@@ -108,13 +107,13 @@ _description:
 STEPS:
 1. install image and boot into OS
 2. Go to system settings > displays
- 3. Toggle the "Scale menu and title bars" bar" bar from 0.5 ~ 4
+ 3. Toggle the "Scale menu and title bars" bar" bar from 0.5 ~ max value
 VERIFICATION:
 1. "Scale menu and title bars" toggle bar should be available in Display settings after completing step 2
 2. The display should not be corrupt when scaled in step 3
 3. Font sizes in the panel, Dash and menus should be adjusted for DPI. Launcher size should be adjusted too after step 3
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.15.4, #1.15.5
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.15.5
 
 plugin: manual
 id: kittyhawk/baseOS/graphics/hidpi-tuning-scale-window
@@ -128,19 +127,47 @@ _description:
 4. Try each option in "Scale all window contents to match"
 VERIFICATION:
 1. "Scale all window contents to match" toggle bar should be available in Display settings after completing step 2
- 2. TBD
+ 2. The results should match Trusty's behavior, details please refer to http://goo.gl/LO5DeT
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.15.4, #1.15.5
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.15.5
 
 plugin: manual
 id: kittyhawk/baseOS/graphics/hidpi-keyboard
 _description:
 PURPOSE:
- 1. (Write here test purpose)
+ 1. Verify that DPI tuning is available via keyboard keys
 STEPS:
- 1. (Write here test execution procedure step by step)
+ 1. install image and boot into OS
+ 2. Go to system settings > displays
+ 3. Toggle the "Scale menu and title bars" bar" bar from 0.5 ~ max value with keyboard up & down keys
+ 4. Connect system to an external monitor
+ 5. Try each option in "Scale all window contents to match"
+ VERIFICATION:
+ 1. Screen DPI should be toggled according to the the value toggled with keyboard
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.15.5
+ 2. Has upstream bug https://bugs.launchpad.net/ubuntu/+source/unity-control-center/+bug/1296966
+
+plugin: manual
+id: kittyhawk/baseOS/graphics/auto-dpi
+_description:
+ PURPOSE:
+ 1. Verify that machine automatically configure the UI to the best render depending on screen's DPI
+ STEPS:
+ 1. Install image on a machine with resolutions 1920*xxxx or above and observe OOBE process
+ 2. Log into OS after installation is completed
+ 3. Go to System Settings > Displays and check value of "Scale menu & windows" bar
+ 4. launch a terminal and execute "cat .config/oem-unity-auto-scale.log" and check output
+ 5. Execute "rm ~/.config/oem-unity-auto-scale.log" in terminal
+ 6. Modify value in Settings > Displays "Scale menu & windows" bar, panel, Dash, menus & Launcher size should change
+ 7. Logout and login again
 VERIFICATION:
- 1. (Write here test verification procedure step by step)
+ 1. OOBE UI should be readable
+ 2. Value of ""Scale menu & windows" bar should be larger than 1 in step 3
+ 3. Output should be larger than 8 in step 4
+ 4. After step 7, "Scale menu & windows" bar value should scale back to the same value seen in step 3
+ 5. After step 7, panel, Dash, menus & Launcher size should return to default seen during step 3
 NOTES:
- 1. (Add here optional notes or remove the whole section)
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.15.4
+ 2. Details please see https://bugs.launchpad.net/kittyhawk/+bug/1287039 comment #22
 
diff --git a/jobs/kittyhawk/baseOS/hardware-support.txt.in b/jobs/kittyhawk/baseOS/hardware-support.txt.in
index 5d5d876..724abe1 100644
--- a/jobs/kittyhawk/baseOS/hardware-support.txt.in
+++ b/jobs/kittyhawk/baseOS/hardware-support.txt.in
@@ -2,43 +2,47 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/accelerometer
 _description:
 PURPOSE:
- 1. Verify that system can support accelerometer daemons for HDD protection
+ 1. Verify that system can support accelerometer daemons for HDD protection
 STEPS:
- 1. (Write here test execution procedure step by step)
+ 1. Launch terminal on a system with accelerometer
+ 2. Execute command "/usr/sbin/hdapsd -p /var/run/hdapsd.pid -d sda -s 15"
+ 3. Tilt machine and check output in terminal
 VERIFICATION:
- 1. (Write here test verification procedure step by step)
+ 1. Terminal should output the following info according to machine tilt movement: Mon May 5 04:45:12 2014: Starting hdapsd Mon May 5 04:45:12 2014: Selected interface: HDAPS Mon May 5 04:45:12 2014: Selected HDAPS input device: /dev/input/event14 Mon May 5 04:45:15 2014: parking Mon May 5 04:45:17 2014: un-parking
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.2
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.2
 
 plugin: manual
 id: kittyhawk/baseOS/hardware-support/combo-audio-jack-osd
 _description:
 PURPOSE:
- 1. Verify provide OSD on plug of audio jack for user to choose between microphone, headphone/speakers, or headset if it is a four ring jack.
+ 1. Make sure that OSD is displayed on plug of audio jack for user to choose between microphone, headphone/speakers, or headset if it is a four ring jack.
 STEPS:
- 1. Need more detail information after feature implement
+ 1. Plug in a headset
 VERIFICATION:
- 1. Does the provide OSD on plug of audio jack displayed?
+ 1. Does OSD show up after plugging in audio jack?
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.5
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.5
 
 plugin: manual
 id: kittyhawk/baseOS/hardware-support/display-osd
 _description:
 PURPOSE:
- 1. Verify On-screen display (OSD) notification should be shown when a user presses a hotkey to switch display settings.
+ 1. Make sure that On-screen display (OSD) notification is shown when a user presses a hotkey to switch display settings.
 STEPS:
- 1. Plug external monitor cable (VGA/HDMI/DP) on system and press display hotkey
+ 1. Plug external monitor cable (VGA/HDMI/DP) on system
+ 2. Launch System settings > Display
+ 3. Press display hotkey to cycle display modes
 VERIFICATION:
- 1. On-screen display (OSD) notification should be shown on each mode (Internal only, mirror mode, external only, extend mode)
+ 1. On-screen display (OSD) notification should be shown on each mode (Internal only, mirror mode, external only, extend mode)
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.4
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.4
 
 plugin: manual
 id: kittyhawk/baseOS/hardware-support/wireless-osd
 _description:
 PURPOSE:
- 1. Verify On-screen display (OSD) notification should be shown when a user presses a hotkey to enable/disable WiFi or bluetooth.
+ 1. Make sure that On-screen display (OSD) notification is shown when a user presses a hotkey to enable/disable WiFi or bluetooth.
 STEPS:
 1. Press Wireless dedicated hardware key/Wireless hotkey to enable/disable WiFi or bluetooth.
 VERIFICATION:
@@ -51,7 +55,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchscreen-tap
 _description:
 PURPOSE:
- 1. Verify touchscreen tap function works correctly
+ 1. Make sure that touchscreen tap function works correctly
 STEPS:
 1. install image onto system
 2. use touchscreen to perform tap
@@ -66,7 +70,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchscreen-drag-drop
 _description:
 PURPOSE:
- 1. Verify touchscreen drag & drop function works correctly
+ 1. Make sure that touchscreen drag & drop function works correctly
 STEPS:
 1. install image onto system
 2. use touchscreen to perform drag & drop on browsers & files
@@ -80,7 +84,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-click
 _description:
 PURPOSE:
- 1. Verify touchpad click works correctly
+ 1. Make sure that touchpad click works correctly
 STEPS:
 1. install image onto system
 2. use touchpad to perform single & double click(s) with right/left button
@@ -96,7 +100,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-scroll-default
 _description:
 PURPOSE:
- 1. Verify default touchpad scroll method is 2-finger scroll
+ 1. Make sure that default touchpad scroll method is 2-finger scroll
 STEPS:
 1. install image onto system
 2. launch any browser (Nautilus, web browser, console) that require scrolling to view complete contents
@@ -116,7 +120,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-2finger-scroll
 _description:
 PURPOSE:
- 1. Verify touchpad 2-finger scroll works correctly
+ 1. Make sure that touchpad 2-finger scroll works correctly
 STEPS:
 1. install image onto system
 2. launch any browser (Nautilus, web browser, console) that require scrolling to view complete contents
@@ -133,7 +137,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-sidebar-scroll
 _description:
 PURPOSE:
- 1. Verify touchpad sidebar scroll works correctly
+ 1. Make sure that touchpad sidebar scroll works correctly
 STEPS:
 1. install image onto system
 2. launch any browser (Nautilus, web browser, console) that require scrolling to view complete contents
@@ -152,7 +156,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-1finger-tap
 _description:
 PURPOSE:
- 1. Verify touchpad 1-finger tap works correctly
+ 1. Make sure that touchpad 1-finger tap works correctly
 STEPS:
 1. install image onto system
 2. Launch Nautilus browser and do single tap on touchpad with one finger on any file or folder
@@ -169,7 +173,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-2fingers-tap
 _description:
 PURPOSE:
- 1. Verify touchpad 2-finger tap works correctly
+ 1. Make sure that touchpad 2-finger tap works correctly
 STEPS:
 1. install image onto system
 2. Launch Nautilus browser & tap touchpad with 2 fingers on any file or folder
@@ -185,7 +189,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-pinch
 _description:
 PURPOSE:
- 1. Verify touchpad pinch works correctly
+ 1. Make sure that touchpad pinch works correctly
 STEPS:
 1. install image onto system
 2. Launch web browser and go to maps.google.com
@@ -204,7 +208,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/blu-ray-write
 _description:
 PURPOSE:
- 1. Verify blu-ray write function works correctly
+ 1. Make sure that blu-ray write function works correctly
 STEPS:
 1. install image onto system
 2. insert a blank blu-ray disk into ODD
@@ -218,7 +222,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/blu-ray-read
 _description:
 PURPOSE:
- 1. Verify blu-ray read function works correctly
+ 1. Make sure that blu-ray read function works correctly
 STEPS:
 1. install image onto system
 2. insert a non blank blu-ray disk into ODD
@@ -232,15 +236,16 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/80211ac
 _description:
 PURPOSE:
- 1. Verify 802.11ac protocol is supported with 100Mbps sustained throughput
+ 1. Make sure that 802.11ac protocol is supported with 100Mbps sustained throughput
 STEPS:
 1. Install image into any machine with 802.11ac wifi card
 2. Connect to any AP that supports 802.11ac protocol
- 3. Execute command "watch iwconfig" in console
+ 3. Execute command "watch iwconfig" in terminal (or install latest iw .deb package and execute command "watch iw dev wlan0 link" for more detailed info)
 4. suspend machine
 5. wake up machine and repeat step 2 ~ 3
 VERIFICATION:
 1. Wifi connection should be successful in step 2 & step 5
+ 2. Make sure connection is indeed via 802.11ac protocol (if "watch iw dev wlan0 link" output contains "80MHz" in "tx bitrate" line then connection is 802.11ac)
 2. Observe iwconfig's contents for a while and make sure the "Bit Rate" value exceeds 100 Mb/s (In TPE office a successful ac connection should exceed 300 Mb/s) in step 3 & step 5
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.13.6
@@ -284,13 +289,16 @@ _description:
 STEPS:
 1. install image
 2. launch any resizable window (ex. text console, nautilus browser)
- 3. tap window with 3 fingers
- 4. pinch window in/out with 3 fingers
- 5. drag the horizontal/vertical/diagonal resize arrows on the sides of window
+ 3. tap window with 3 fingers and hold
+ 4. with 3 fingers, drag window up/down/left/right
+ 5. pinch window in/out with 3 fingers
+ 6. release 3 fingers
+ 7. drag the horizontal/vertical/diagonal resize arrows on the sides of window with 1 finger
 VERIFICATION:
 1. tapping window with 3 fingers enters MT Grab Handle mode
- 2. window can be expanded/folded by pinching fingers apart/together
- 3. window can be resized by dragging the horizontal/vertical/diagonal resize arrows on the sides of window
+ 2. window can be dragged with 3 fingers
+ 3. window can be expanded/folded by pinching fingers apart/together
+ 4. window can be resized by dragging the horizontal/vertical/diagonal resize arrows on the sides of window
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.19.3
 
@@ -298,7 +306,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchscreen-unity7-application
 _description:
 PURPOSE:
- 1. Verify app can be launched or brought forward via touchscreen
+ 1. Make sure that app can be launched or brought forward via touchscreen
 STEPS:
 1. install image
 2. tap any un-launched app on the launcher with 1 finger
@@ -340,7 +348,7 @@ plugin: manual
 id: kittyhawk/baseOS/hardware-support/touchpad-drag-drop
 _description:
 PURPOSE:
- 1. Verify touchpad's drag & drop function works correctly
+ 1. Make sure that touchpad's drag & drop function works correctly
 STEPS:
 1. install image onto system
 2. use touchpad to perform drag & drop on windows & files
diff --git a/jobs/kittyhawk/baseOS/installer.txt.in b/jobs/kittyhawk/baseOS/installer.txt.in
index 61d1b41..85507f3 100644
--- a/jobs/kittyhawk/baseOS/installer.txt.in
+++ b/jobs/kittyhawk/baseOS/installer.txt.in
@@ -2,7 +2,7 @@ plugin: manual
 id: kittyhawk/baseOS/installer/translated
 _description:
 PURPOSE:
- 1. Verify that OS installer should be fully translated in all supported languages
+ 1. Verify that the OS installer should be fully translated in all supported languages
 STEPS:
 1. In language selection, select one of the following languages: Catalan, Czech, Danish, German, English, Spanish, Euskera (Basque), French, Galician, Italian, Hungarian, Dutch, Polish, Portuguese, Brazilian Portuguese, Slovak, Finnish, Swedish, Greek, Bulgarian, Russian, Korean, Simplified Chinese, Traditional Chinese, Japanese; continue the install
 VERIFICATION:
@@ -15,7 +15,7 @@ plugin: manual
 id: kittyhawk/baseOS/installer/default-language
 _description:
 PURPOSE:
- 1. Verify the default installer language is English
+ 1. Verify that the default installer language is English
 STEPS:
 1. Check the default language in language selection step
 VERIFICATION:
diff --git a/jobs/kittyhawk/baseOS/keyboard-shortcuts.txt.in b/jobs/kittyhawk/baseOS/keyboard-shortcuts.txt.in
index 979dcfc..13b0d96 100644
--- a/jobs/kittyhawk/baseOS/keyboard-shortcuts.txt.in
+++ b/jobs/kittyhawk/baseOS/keyboard-shortcuts.txt.in
@@ -2,7 +2,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/app-lens
 _description:
 PURPOSE:
- 1. Verify clicking Super + A opens the Application lens
+ 1. Make sure that clicking Super + A opens the Application lens
 STEPS:
 1. Press Super + A
 VERIFICATION:
@@ -14,19 +14,21 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/ctrl-super-down
 _description:
 PURPOSE:
- 1. Verify clicking Ctrl + Super + Down able to minimizes the current window
+ 1. Make sure that clicking Ctrl + Super + Down minimizes the current window
 STEPS:
- 1. Focus on the maximizes window and press Ctrl + Super + Down
+ 1. Focus on a maximized window and press Ctrl + Super + Down
+ 2. Focus on a non-maximized window and press Ctrl + Super + Down
 VERIFICATION:
- 1. Current window size will restores or minimizes
+ 1. Window will shrink to default size in step 1
+ 2. Window will minimize in step 2
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.7.14
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.7.14
 
 plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/ctrl-super-left-right
 _description:
 PURPOSE:
- 1. Verify clicking Ctrl + Super + Left or Right able to Semi-maximized the current window
+ 1. Make sure that clicking Ctrl + Super + Left or Right semi-maximizes the current window
 STEPS:
 1. Focus on the any window and press Ctrl + Super + Left or Right
 VERIFICATION:
@@ -38,7 +40,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/ctrl-super-up
 _description:
 PURPOSE:
- 1. Verify clicking Ctrl + Super + Up able to maximizes the current window
+ 1. Make sure that clicking Ctrl + Super + Up maximizes the current window
 STEPS:
 1. Focus on the non-maximizes window and press Ctrl + Super + Up
 VERIFICATION:
@@ -50,7 +52,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/expo
 _description:
 PURPOSE:
- 1. Verify clicking Super + S shows the expo mode: zooms out on all the workspaces and lets you manage them
+ 1. Make sure that clicking Super + S shows the expo mode: zooms out on all the workspaces and lets you manage them
 STEPS:
 1. Press Super + S and use arrow key to move between workspaces.
 VERIFICATION:
@@ -62,7 +64,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/file-lens
 _description:
 PURPOSE:
- 1. Verify clicking Super + F opens the File and Folders lens
+ 1. Make sure that clicking Super + F opens the File and Folders lens
 STEPS:
 1. Press Super + F
 VERIFICATION:
@@ -74,7 +76,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/minimize
 _description:
 PURPOSE:
- 1. Verify clicking Ctrl + Super + D minimizes all windows, and clicking it again restores them
+ 1. Make sure that clicking Ctrl + Super + D minimizes all windows, and clicking it again restores them
 STEPS:
 1. Launch all application on the launcher
 2. Press Ctrl + Super + D
@@ -88,7 +90,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/music-len
 _description:
 PURPOSE:
- 1. Verify clicking Super + M opens the Music lens
+ 1. Make sure that clicking Super + M opens the Music lens
 STEPS:
 1. Press Super + M
 VERIFICATION:
@@ -100,7 +102,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/spread
 _description:
 PURPOSE:
- 1. Verify clicking Super + W shows the spread mode: zooms out on all windows in all workspaces
+ 1. Make sure that clicking Super + W shows the spread mode: zooms out on all windows in all workspaces
 STEPS:
 1. Launch all application on the launcher
 2. Press Super + W
@@ -113,7 +115,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/super-hold
 _description:
 PURPOSE:
- 1. Verify holding the Super key invokes the sidebar Launcher
+ 1. Make sure that holding the Super key invokes the sidebar Launcher
 STEPS:
 1. Hold the Super key
 VERIFICATION:
@@ -125,7 +127,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/super-number
 _description:
 PURPOSE:
- 1. Verify clicking Super Key + 1, 2, ..., 0 opens or draws focus to the application whose position in the launcher corresponds to the pressed number
+ 1. Make sure that clicking Super Key + 1, 2, ..., 0 opens or draws focus to the application whose position in the launcher corresponds to the pressed number
 STEPS:
 1. Click Super + 1
 2. Repeat Step 1 with different number
@@ -138,7 +140,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/super-shift-number
 _description:
 PURPOSE:
- 1. Verify clicking Super + Shift + 1,2,...,0, opens a new instance of that application if it is already open
+ 1. Make sure that clicking Super + Shift + 1,2,...,0, opens a new instance of that application if it is already open
 STEPS:
 1. Launch all application on the launcher
 2. Click Super + Shift + 1
@@ -153,11 +155,13 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/super-tab
 _description:
 PURPOSE:
- 1. Verify pressing the Super key shall toggle the Unity Dash view
+ 1. Make sure that pressing the Super key toggles the Unity Dash view
 STEPS:
 1. Press the Super key
+ 2. Press the Super key again
 VERIFICATION:
- 1. Unity Dash should appear
+ 1. Unity Dash should appear in step 1
+ 2. Unity Dash should close in step 2
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.7.1
 
@@ -165,7 +169,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/switch-app
 _description:
 PURPOSE:
- 1. Verify hold Super Key and tap Tab key able to switch applications via launcher
+ 1. Make sure that holding Super Key and tap Tab key switches applications via launcher
 STEPS:
 1. Press Super Key and tap Tab key to switch applications via launcher.
 VERIFICATION:
@@ -177,7 +181,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/trash
 _description:
 PURPOSE:
- 1. Verify clicking Super + T opens the Trash
+ 1. Make sure that clicking Super + T opens the Trash
 STEPS:
 1. Press Super + T
 VERIFICATION:
@@ -189,7 +193,7 @@ plugin: manual
 id: kittyhawk/baseOS/keyboard-shortcuts/mic-mute
 _description:
 PURPOSE:
- 1. Verify clicking mic mute hotkey mutes the microphone
+ 1. Make sure that clicking mic mute hotkey mutes the microphone
 STEPS:
 1. Launch any audio recording app to start recording audio from internal mic
 2. While recording, press mic mute key
diff --git a/jobs/kittyhawk/baseOS/launcher.txt.in b/jobs/kittyhawk/baseOS/launcher.txt.in
index 5631e2d..0e83d4f 100644
--- a/jobs/kittyhawk/baseOS/launcher.txt.in
+++ b/jobs/kittyhawk/baseOS/launcher.txt.in
@@ -2,14 +2,14 @@ plugin: manual
 id: kittyhawk/baseOS/launcher/default
 _description:
 PURPOSE:
- 1. Verify Launcher has "Dash Home", "Home Folder", "Default Web Browser", "LibreOffice Writer", "LibreOffice Calc", "LibreOffice Impress", "Software Center", "System Settings" workspace swither, and Trash icons
+ 1. Make sure that Launcher has correct default icons
 STEPS:
- 1. Login system and check icons on the Launcher.
- 2. Launch all of them and close.
+ 1. Login system and check icons on the Launcher.
+ 2. Launch all of them and close.
 VERIFICATION:
- 1. There should be "Dash Home", "Home Folder", "Default Web Browser", "LibreOffice Writer", "LibreOffice Calc", "LibreOffice Impress", "Software Center", "System Settings" workspace swither, and Trash icons
- 2. All of them can be opened and closed successfully.
- 3. No other launchers should exist as default
+ 1. There should be "Dash Home", "Home Folder", "Default Web Browser", "LibreOffice Writer", "LibreOffice Calc", "LibreOffice Impress", "Software Center", "Amazon", "System Settings" workspace swither, and Trash icons
+ 2. All of them can be opened and closed successfully.
+ 3. No other launchers should exist as default
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.8.1
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.8.1
 
diff --git a/jobs/kittyhawk/baseOS/oobe.txt.in b/jobs/kittyhawk/baseOS/oobe.txt.in
index 17b16b3..83e2e2c 100644
--- a/jobs/kittyhawk/baseOS/oobe.txt.in
+++ b/jobs/kittyhawk/baseOS/oobe.txt.in
@@ -2,11 +2,11 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-start
 _description:
 PURPOSE:
- 1. Verify oem-config, the first boot program, is run
- 2. Verify fsck is not run on first boot
- 3. Verify the startup video is played full-screen and at least 720p quality.
- 4. Verify that video is played without any lags, and no OSD to detract the experience
- 5. Verify that the video load time is not longer than 45 seconds.
+ 1. Make sure that oem-config, the first boot program, is run
+ 2. Make sure that fsck is not run on first boot
+ 3. Make sure that the startup video is played full-screen and at least 720p quality.
+ 4. Make sure that the video is played without any lags, and no OSD to detract the experience
+ 5. Make sure that the video load time is not longer than 45 seconds.
 6. Verify that time required to perform final system configuration in OOBE
 7. Verify that the system does not spend time re-compiling dkms during first boot
 STEPS:
@@ -148,7 +148,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/after-OOBE-recovery-creator
 _description:
 PURPOSE:
- 1. Verify that user can create recovery media (CD/DVD/USB) after OOBE
+ 1. Verify that a user can create recovery media (CD/DVD/USB) after OOBE
 STEPS:
 1. Install system and boot up to desktop
 2. In the dash search "recovery" and select "Recovery Media Creator"
@@ -163,7 +163,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/reset-uuid
 _description:
 PURPOSE:
- 1. Verify system reset the dbus UUID (/var/lib/dbus/machine-id) after installation, so that no two machines created from the same master OS image have the same dbus ID.
+ 1. Verify that system reset the dbus UUID (/var/lib/dbus/machine-id) after installation, so that no two machines created from the same master OS image have the same dbus ID.
 STEPS:
 1. Install image
 2. Once installation is complete and user enters OS, run "dbus-uuidgen --get" command and record the UUID
@@ -200,7 +200,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/first-boot
 _description:
 PURPOSE:
- 1. Verify oem-config will run on the first boot
+ 1. Verify that oem-config will run on the first boot
 STEPS:
 1. Install the system.
 VERIFICATION:
@@ -212,7 +212,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/no-fsck
 _description:
 PURPOSE:
- 1. Ensure OS does not fsck on first boot, regardless of time/date settings in the BIOS/filesystems
+ 1. Ensure that OS does not fsck on first boot, regardless of time/date settings in the BIOS/filesystems
 STEPS:
 1. Install the system.
 VERIFICATION:
@@ -244,7 +244,7 @@ _description:
 1. Install the system.
 2. After installation is complete, launch terminal and execute "dkms status"
 VERIFICATION:
- 1. no dkms packages should be returned in Step 2
+ 1. no "customized" dkms packages (ex. for specific platform, proprietary driver) should be returned in Step 2. Only dkms packages with "generic" fixes can be included.
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.6.16
 
@@ -252,7 +252,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/poweron-to-oobe-time
 _description:
 PURPOSE:
- 1. Verify that time between power-on and OOBE video should be no more than 45 seconds.
+ 1. Verify that the time needed between power-on and OOBE video should be no more than 45 seconds.
 STEPS:
 1. Install the system.
 2. After system reboots to enter OOBE, observe the time needed between poweron ~ the start of OOBE video.
diff --git a/jobs/kittyhawk/baseOS/oobe/oem-config-settings.txt.in b/jobs/kittyhawk/baseOS/oobe/oem-config-settings.txt.in
index 01840b0..be5cf39 100644
--- a/jobs/kittyhawk/baseOS/oobe/oem-config-settings.txt.in
+++ b/jobs/kittyhawk/baseOS/oobe/oem-config-settings.txt.in
@@ -2,11 +2,11 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/checklist
 _description:
 PURPOSE:
- 1. Verify OEM-config guides the user through the following steps: Language selection, OEM EULA, Wifi/Wired Internet configuration, Set location, Keyboard layout, User account creation, Recovery media creation
+ 1. Make sure that OEM-config guides the user through the following steps: Language selection, Wifi/Wired Internet configuration, Set location, Keyboard layout, User account creation, Recovery media creation
 STEPS:
 1. After the short video is played, observe all the settings oem-config presents
 VERIFICATION:
- 1. OEM-config should guide the user through the following steps: Language selection, OEM EULA, Wifi/Wired Internet configuration, Set location, Keyboard layout, User account creation, Recovery media creation
+ 1. OEM-config should guide the user through the following steps: Language selection, Wifi/Wired Internet configuration, Set location, Keyboard layout, User account creation, Recovery media creation
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.6.5
 
@@ -14,7 +14,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/language
 _description:
 PURPOSE:
- 1. Verify product shall prompt the user for a default system language
+ 1. Make sure that product prompts the user for a default system language
 STEPS:
 1. Continue after kittyhawk/baseOS/oobe/oem-config-start, note the first setup step in oem-config.
 VERIFICATION:
@@ -26,7 +26,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/wireless
 _description:
 PURPOSE:
- 1. Verify if a wireless adapter is present and there are wireless networks available the user should be prompted to select one.
+ 1. Verify that if a wireless adapter is present and there are wireless networks available, the user should be prompted to select one.
 STEPS:
 1. Continue after kittyhawk/baseOS/oobe/oem-config-settings/language
 VERIFICATION:
@@ -55,8 +55,8 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/location-1
 _description:
 PURPOSE:
- 1. Verify user shall have the ability to choose a location.
- 2. Verify the default one is based on location-based information from IP address if system is connected to network.
+ 1. Make sure that the user is able to choose a location.
+ 2. Make sure that the default location is based on location-based information from IP address if system is connected to network.
 STEPS:
 1. Continue after kittyhawk/baseOS/oobe/oem-config-settings/network, note the 4th setup step in oem-config.
 2. Record the default location pre-selected by the system.
@@ -73,8 +73,8 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/location-2
 _description:
 PURPOSE:
- 1. Verify the defalt location is based on the language chosen if system is not connected to network.
- 2. Verify if system is connected to network and the location information from IP address is different from where the city will be chosen based on the language setting, the default one should be based on the location information from IP address.
+ 1. Make sure that the defalt location is based on the language chosen if system is not connected to network.
+ 2. Verify that if system is connected to network and the location information from IP address is different from where the city will be chosen based on the language setting, the default one should be based on the location information from IP address.
 STEPS:
 1. After choosing a language and not connecting to the network, Record the default location pre-selected by the system.
 2. Restart the installation agaion, choose a language that's different from where you are, e.g., choose Korean while you are located in a country other than Korea. Connect to the network. Record the default location pre-selected by the system.
@@ -88,7 +88,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/keyboard
 _description:
 PURPOSE:
- 1. Verify user shall have the ability to choose a keyboard layout
+ 1. Make sure that the user is able to choose a keyboard layout
 STEPS:
 1. Continue after kittyhawk/baseOS/oobe/oem-config-settings/location
 VERIFICATION:
@@ -100,7 +100,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/account
 _description:
 PURPOSE:
- 1. Verify user shall have the ability to set up a user account.
+ 1. Make sure that the user is able to set up a user account.
 STEPS:
 1. Continue after kittyhawk/baseOS/oobe/oem-config-settings/keyboard
 VERIFICATION:
@@ -112,7 +112,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/recovery
 _description:
 PURPOSE:
- 1. Verify recovery media creation is prompted for user to create a recovery image on a USB/DVD media.
+ 1. Make sure that recovery media creation prompts user to create a recovery image on a USB/DVD media.
 STEPS:
 1. Continue after kittyhawk/baseOS/oobe/oem-config-settings/account
 VERIFICATION:
@@ -124,7 +124,7 @@ plugin: manual
 id: kittyhawk/baseOS/oobe/oem-config-settings/recovery-media-creator
 _description:
 PURPOSE:
- 1. Provide an optional step in the OOBE experience allowing users to create a recovery image on a USB/DVD in addition to or in place of a recovery partition. The user should be presented with the option of running a factory restore or a system recovery which would preserver user data in /home.
+ 1. Make sure that an optional step in the OOBE experience allowing users to create a recovery image on a USB/DVD in addition to or in place of a recovery partition is available.
 STEPS:
 1. Install system to the OOBE stage
 2. Insert USB to USB port /DVD to DVD-Writer
diff --git a/jobs/kittyhawk/baseOS/secure-boot.txt.in b/jobs/kittyhawk/baseOS/secure-boot.txt.in
index cf718a5..4afea20 100644
--- a/jobs/kittyhawk/baseOS/secure-boot.txt.in
+++ b/jobs/kittyhawk/baseOS/secure-boot.txt.in
@@ -34,7 +34,7 @@ plugin: manual
 id: kittyhawk/baseOS/secure-boot/recovery
 _description:
 PURPOSE:
- 1. Verify on a secure-boot-enabled system, the system can boot to Ubuntu successfully after factory restore.
+ 1. Verify that on a secure-boot-enabled system, the system can boot to Ubuntu successfully after factory restore.
 STEPS:
 1. On a secure-boot-enabled system, install Ubuntu OS
 2. Restart the system, and enter the boot menu and do a factory restore
@@ -49,7 +49,7 @@ plugin: manual
 id: kittyhawk/baseOS/secure-boot/UEFI-secureboot
 _description:
 PURPOSE:
- 1. Verify image can be installed successfully on secure boot enabled UEFI systems
+ 1. Verify that image can be installed successfully on secure boot enabled UEFI systems
 STEPS:
 1. Set BIOS to UEFI with secure boot.
 2. Boot from DVD/USB installer
@@ -63,7 +63,7 @@ plugin: manual
 id: kittyhawk/baseOS/secure-boot/OS-secureboot
 _description:
 PURPOSE:
- 1. Verify Ubuntu can be boot with secure boot enabled
+ 1. Verify that Ubuntu can be boot with secure boot enabled
 STEPS:
 1. Set BIOS to UEFI without secure boot.
 2. Install Kitty Hawk image.
diff --git a/jobs/kittyhawk/baseOS/startup.txt.in b/jobs/kittyhawk/baseOS/startup.txt.in
index aeda4ff..d5be014 100644
--- a/jobs/kittyhawk/baseOS/startup.txt.in
+++ b/jobs/kittyhawk/baseOS/startup.txt.in
@@ -2,7 +2,7 @@ plugin: manual
 id: kittyhawk/baseOS/startup/text-free-startup-shutdown
 _description:
 PURPOSE:
- 1. Verify no text console should ever be displayed during startup or shutdown.
+ 1. Make sure that no text console should ever be displayed during startup or shutdown.
 STEPS:
 1. Install the system, after login, shut down the system from power menu.
 2. Power on the system
@@ -16,7 +16,7 @@ plugin: manual
 id: kittyhawk/baseOS/startup/boot
 _description:
 PURPOSE:
- 1. Verify the grub is invisible to the user and the entire boot process take less then 45 seconds
+ 1. Make sure that grub is invisible to the user and the entire boot process take less then 45 seconds
 STEPS:
 1. Install the system and login to Desktop
 2. Launch "Terminal" application by pressing Alt+Ctrl+T and type "less /etc/default/grub" in the Terminal
@@ -48,7 +48,7 @@ plugin: manual
 id: kittyhawk/baseOS/startup/text-free-suspend
 _description:
 PURPOSE:
- 1. Verify no text console should ever be displayed during suspend or resume.
+ 1. Make sure that no text console should ever be displayed during suspend or resume.
 STEPS:
 1. Install the system, after login, suspend the system from power menu.
 2. Resume the system
@@ -61,7 +61,7 @@ plugin: manual
 id: kittyhawk/baseOS/startup/boot-loader
 _description:
 PURPOSE:
- 1. System BIOS should launch the bootloader no more than 5 seconds after power-on on reference hardware. The bootloader should run in “quiet” mode with a timeout value of “0”. In this manner, the bootloader should not be visible to the user.
+ 1. Make sure that system BIOS launch the bootloader no more than 5 seconds after power-on on reference hardware and the bootloader runs in “quiet” mode with a timeout value of “0”.
 STEPS:
 1. Install the system and login to Desktop
 2. Launch "Terminal" application by pressing Alt+Ctrl+T and type "less /etc/default/grub" in the Terminal
@@ -79,7 +79,7 @@ plugin: manual
 id: kittyhawk/baseOS/startup/boot-speed
 _description:
 PURPOSE:
- 1. The entire boot process (from post to usable desktop - autologin enabled) should take less than 45 seconds even on the slowest hard drives (5400 RPM HDD).
+ 1. Make sure that the entire boot process (from post to usable desktop - autologin enabled) should take less than 45 seconds even on the slowest hard drives (5400 RPM HDD).
 STEPS:
 1. Install the system and login to Desktop
 VERIFICATION:
diff --git a/jobs/kittyhawk/baseOS/third-party-add-on.txt.in b/jobs/kittyhawk/baseOS/third-party-add-on.txt.in
index 735fece..e3ba184 100644
--- a/jobs/kittyhawk/baseOS/third-party-add-on.txt.in
+++ b/jobs/kittyhawk/baseOS/third-party-add-on.txt.in
@@ -2,18 +2,18 @@ plugin: manual
 id: kittyhawk/baseOS/third-party-add-on/Adobe-flash
 _description:
 PURPOSE:
- 1. To validate that user is not steered to a non-functional download page. Either direct them to the right place, or else do not prompt them to install Flash at all.
+ 1. Make sure that user is not steered to a non-functional download page. Either direct them to the right place, or else do not prompt them to install Flash at all.
 STEPS:
- 1. After install the image, log in to the desktop and open a web browser to watch videos on youtube.com
- 2. If a prompt pops up requesting user to install Flash, try to install Flash and check if installation is successful.
+ 1. After install the image, log in to the desktop and open default web browser to watch videos on youtube.com
+ 2. If a prompt pops up requesting user to install Flash, try to install Flash and check if installation is successful.
 VERIFICATION:
- 1. As a default, Adobe Flash should be disabled and user should *not* be able to view youtube videos.
- 2. If no "install Flash" related prompts/links are shown and verification 1 passed, this test case can count as PASSED.
- 3. If "install Flash" related prompts/links are shown and installation is *not* successful after clicking the prompts/links, this case should count as "FAILED"
- 4. If "install Flash" related prompts/links are shown and installation is successful (Youtube videos can be played after installation), this case should count as "PASSED"
+ 1. As a default, Adobe Flash should be disabled and user should *not* be able to view youtube videos.
+ 2. If no "install Flash" related prompts/links are shown and verification 1 passed, this test case can count as PASSED.
+ 3. If "install Flash" related prompts/links are shown and installation is *not* successful after clicking the prompts/links, this case should count as "FAILED"
+ 4. If "install Flash" related prompts/links are shown and installation is successful (Youtube videos can be played after installation), this case should count as "PASSED"
 NOTES:
- 1. Assuming Adobe Flash is required on youtube.com and HTML5 is not enabled.
- 2. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.10.2, #1.10.3
+ 1. Assuming Adobe Flash is required on youtube.com and HTML5 is not enabled.
+ 2. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.10.2, #1.10.3, #1.18.6
 
 plugin: manual
 id: kittyhawk/baseOS/third-party-add-on/Java-REMOVED
@@ -31,14 +31,15 @@ plugin: manual
 id: kittyhawk/baseOS/third-party-add-on/fluendo-mp3
 _description:
 PURPOSE:
- 1. Verify that Fluendo MP3 codec is installed by default
+ 1. Verify that Fluendo MP3 codec is installed by default
 STEPS:
- 1. Install image, check if 'gstreamerX.XX-fluendo-mp3' is installed by typing "dpkg -l | grep fluendo" in terminal
+ 1. Install image, check if 'gstreamerX.XX-fluendo-mp3' is installed by typing "dpkg -l | grep fluendo" in terminal
+ 2. Go to Home > Example folder > launch Josh Woodward-Swansong.ogg
 VERIFICATION:
- 1. gstreamerX.XX-fluendo-mp3 should be installed by default
- 2. MP3 'notice' must be displayed.
+ 1. gstreamerX.XX-fluendo-mp3 should be installed by default
+ 2. 'MP3 notice' must be displayed during the first time user does step 2
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.10.1
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.10.1
 
 plugin: manual
 id: kittyhawk/baseOS/third-party-add-on/skype-REMOVED
@@ -74,7 +75,7 @@ plugin: manual
 id: kittyhawk/baseOS/third-party-add-on/chromium-browser-REMOVED
 _description:
 PURPOSE:
- 1. Verify Chromium web browser can be found in Software Center and can be installed successfully
+ 1. Make sure that Chromium web browser can be found in Software Center and can be installed successfully
 STEPS:
 1. Install image, login, connect to network, and launch Software Center
 2. Search for Chromium web browser and install
@@ -85,3 +86,112 @@ _description:
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.10.10
 
+plugin: manual
+id: kittyhawk/baseOS/third-party-add-on/chromium-as-default
+_description:
+ PURPOSE:
+ 1. Verify that default browser is be Chromium
+ STEPS:
+ 1. Install Kittyhawk and observe slideshows displayed during isntallation phase 2 & 3
+ 2. After booting into OS, observe icons in the Launcher bar
+ 3. Launch Chromium
+ 4. Open dash and search for Firefox
+ 5. Launch "Tour" from Dash
+ 6. Launch "Help" from Dash
+ VERIFICATION:
+ 1. Slideshows displayed during installation should indicate that Chromium is the default browser.
+ 2. Chromium icon should be in the Launcher bar, Firefox icon should not
+ 3. Chromium can be launched and works correctly
+ 4. Firefox should be removed from system and not found when searching in dash
+ 5. Tour should be launched with Chromium as a default, and should include info on Chromium
+ 6. Help should include info on Chromium
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.18.1
+
+plugin: manual
+id: kittyhawk/baseOS/third-party-add-on/chromium-touchscreen
+_description:
+ PURPOSE:
+ 1. Verify that users are able to browse with Touchscreen+Keyboard
+ 2. Verify that additional touchscreen features are supported by Chromium
+ STEPS:
+ 1. Install Kittyhawk and boot into OS
+ 2. Launch Chromium
+ 3. Interact with Chromium with touchscreen & keyboard (ex. tap links, scroll page, tap tool bar items, insert search keywords)
+ VERIFICATION:
+ 1. 1-finger touch should open link should open a link
+ 2. 1-finger long touch should open right-click menu
+ 3. 1-finger swipe should be horizontal and vertical scrolling
+ 4. 2-finger pinch-zoom should work correctly.
+ 5. Words should be able to be inserted with keyboard
+ 6. 2-finger swipe left or right should go backwards and forwards on web pages
+ 7. Should support touch enabled text selection
+ 8 . Should support touch enabled drag and drop.
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.18.2, #1.18.1
+
+plugin: manual
+id: kittyhawk/baseOS/third-party-add-on/chromium-touchpad
+_description:
+ PURPOSE:
+ 1. Verify that users are able to browse with Touchpad+Keyboard
+ 2. Verify that additional touchpad features are supported by Chromium
+ STEPS:
+ 1. Install Kittyhawk and boot into OS
+ 2. Launch Chromium
+ 3. Interact with Chromium with touchpad (ex. scroll, click)
+ VERIFICATION:
+ 1. 1-finger tap to open link should open a link
+ 2. 2-finger tap should open right-click menu
+ 3. right & left click with touchpad should work correctly
+ 4. 2-finger vertical scrolling with touchpad should be supported
+ 5. 2-finger pinch-zoom should be supported in sites such as google map
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.18.3, #1.18.1
+
+plugin: manual
+id: kittyhawk/baseOS/third-party-add-on/chromium-scrolling
+_description:
+ PURPOSE:
+ 1. Verify that scrolling with Touchscreen or Touchpad in Chromium is as smooth as when using mouse
+ STEPS:
+ 1. Install Kittyhawk and boot into OS
+ 2. Launch Chromium
+ 3. Scroll Chromium pages with touchscreen, touchpad & mouse
+ VERIFICATION:
+ 1. Scrolling with touchscreen should be smooth
+ 2. Scrolling with touchspad (2 finger & side scroll) should be smooth
+ 3. Scrolling with mouse should be smooth
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.18.4, #1.18.1
+
+plugin: manual
+id: kittyhawk/baseOS/third-party-add-on/chromium-hidpi
+_description:
+ PURPOSE:
+ 1. Verify that the browser detect that it runs on a HiDPI display and adjust rendering
+ STEPS:
+ 1. Install Kittyhawk and boot into OS
+ 2. Launch Chromium
+ 3. Go to system settings > displays > toggle "scale for menu title and bars"
+ VERIFICATION:
+ 1. Chromium should run in a DPI display that matches the test machine
+ 2. Chromium should adjust according to settings in step 3
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.18.5
+
+plugin: manual
+id: kittyhawk/baseOS/third-party-add-on/chromium-mouse
+_description:
+ PURPOSE:
+ 1. Verify that users are able to browse with Mouse+Keyboard
+ STEPS:
+ 1. Install Kittyhawk and boot into OS
+ 2. Launch Chromium
+ 3. Interact with Chromium with a mouse (ex. click, double click, scroll)
+ VERIFICATION:
+ 1. scrolling with mouse should be smooth
+ 2. clicking with mouse left/right button should work
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.18.1
+
diff --git a/jobs/kittyhawk/consumer/retail-mode.txt.in b/jobs/kittyhawk/consumer/retail-mode.txt.in
index 25e200c..0b6c691 100644
--- a/jobs/kittyhawk/consumer/retail-mode.txt.in
+++ b/jobs/kittyhawk/consumer/retail-mode.txt.in
@@ -4,48 +4,49 @@ _description:
 PURPOSE:
 1. Making sure that Retail mode does not appear by default when installing a system
 STEPS:
- 1.Power on the system
- 2.Let the system finish the boot process
+ 1. Install image and finish installation process
 VERIFICATION:
 1. The “First Boot” configuration wizard appears
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.1
+ 2. RETAIL-NON-UR-ENGLISH-0001, RETAIL-RECOVERY-ENGLISH-0001, RETAIL-NON-UR-CHINESE-0001
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/activate-retail-mode
 _description:
 PURPOSE:
- 1. verify that have option to choose retail or point of sale mode during OOBE
+ 1. Verify that there is an option to boot into retail mode.
 STEPS:
- 1. Power on the system and wait until the Ubuntu logo (with the dots) appear
- 2. Press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
- 3. When the system finishes booting, the greeter with the Guest session will appear (instead of oem-config wizard)
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When screen switches to login screen, press enter to enter retail mode as "guest"
 VERIFICATION:
- 1. When the boot process finishes, Unity Greeter screen appears
- 2. The only session available to the user is “Guest Session”
- 3. Clicking on the power indicator don’t show the Suspend/Hibernate/Shutdown options
+ 1. User is directed to login screen after step 2 and the only session available to the user is “Guest Session”
+ 2. User can enter retail mode OS in step 3
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.1
+ 2. RETAIL-NON-UR-ENGLISH-0002, RETAIL-RECOVERY-ENGLISH-0002, RETAIL-NON-UR-CHINESE-0002
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/setup-first-boot-mode
 _description:
 PURPOSE:
- 1. Verify the system will run oem-config and configure a user for normal use from retail mode
+ 1. Verify that there is an option during boot or run time to change system back to standard mode.
 STEPS:
- 1. In the Log-In screen press simultaneously Ctrl+Shift+Alt
- 2. A new menu, “Configure this system” appears
- 3. Click on “Configure this system “ and type “oem” as password
- 4. The “admin” session will be started
- 5. Double-click on “Prepare for shipping to end user” in the desktop
- 6. Password should be “oem”
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When screen switches to login screen press Ctrl+Shift+Alt simultaneously to login as the hidden OEM user
+ 3. The “admin” session will be started
+ 5. Double-click on “Prepare for shipping to end user” in the desktop (password is “oem”)
 7. Select “Standard (end-user)”
 8. Shutdown the system
 9. Boot up the system
 VERIFICATION:
- 1. The “First Boot” configuration wizard appears and can be finish the installation
+ 1. After step 9, the system will run oem-config and configure a user for normal use
+ 2. The oem-config process can be completed and standard OS installation is successful.
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.2
+ 2. RETAIL-NON-UR-ENGLISH-0009, RETAIL-RECOVERY-ENGLISH-0009, RETAIL-NON-UR-CHINESE-0010
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/browse-retail-mode
@@ -53,12 +54,14 @@ _description:
 PURPOSE:
 1. Verify system only support one user with no login prompt
 STEPS:
- 1. Unity Greeter with “Guest Session” option is being shown
- 2. Click on “Guest Session”
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When unity Greeter with “Guest Session” option is being shown, press enter
 VERIFICATION:
- 1. A Guest Session starts without a password prompt and login success
+ 1. A Guest Session starts without a password prompt and login is successful
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.3
+ 2. RETAIL-NON-UR-ENGLISH-0003, RETAIL-RECOVERY-ENGLISH-0003, RETAIL-NON-UR-CHINESE-0004
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/no-terminal
@@ -66,11 +69,16 @@ _description:
 PURPOSE:
 1. Verify user shall have no access to a terminal from retail mode
 STEPS:
- 1. Verify the terminal can not launch by press Ctrl + Alt + T under retail mode
- 2. Verify the terminal no search result in unity dash
- 3. Verify can not switch to console mode
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When unity Greeter with “Guest Session” option is being shown, press enter
+ 4. Try to launch the terminal by pressing Ctrl + Alt + T in retail mode
+ 5. Try to launch the terminal in Dash
+ 6. Try to switch to console mode with Ctrl + Alt + F1
 VERIFICATION:
- 1. Does Terminal mode launch?
+ 1. Terminal should not be launched in step 4
+ 2. Terminal should not be launched in step 5
+ 3. Should not be able to switch to console mode in step 6
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.4
 
@@ -134,6 +142,7 @@ _description:
 1. Does Shotwell Photo viewer have demo photos in it?
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.9
+ 2. RETAIL-NON-UR-ENGLISH-0004
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/gwibber-REMOVED
@@ -167,12 +176,15 @@ _description:
 PURPOSE:
 1. Verify that settings and sample content should be reset on login
 STEPS:
- 1. Create any documents and delete any file under Retail mode
- 2. Change any settings
- 2. Log out
- 3. Log in
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When unity Greeter with “Guest Session” option is being shown, press enter
+ 4. Create any documents and delete any file
+ 5. Change any settings
+ 6. Log out
+ 7. Log in
 VERIFICATION:
- 1. Does settings and sample content reset on login?
+ 1. Settings and sample contents should reset after step 7
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.12
 
@@ -180,34 +192,40 @@ plugin: manual
 id: kittyhawk/consumer/retail-mode/reset-option
 _description:
 PURPOSE:
- 1. Verify that staff have option to easily reset the settings and sample content
+ 1. Verify that staffs have an option to easily reset the settings and sample content
 STEPS:
- 1. Verify that staff have option to easily reset the settings and sample content
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When unity Greeter with “Guest Session” option is being shown, press enter
+ 4. Do some system settings and delect/add some pictures,videos,documents
+ 5. Log out
+ 6. Log in
 VERIFICATION:
- 1. If reset on login pass, then this case pass.
+ 1. Settings & contents should reset after step 6
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.13
- 2. If reset on login pass, then this case pass.
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.13
+ 2. If reset after login, then this case pass.
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/first-boot-after-configuration
 _description:
 PURPOSE:
- 1. When a user has configured a system, it is not possible to go back to retail mode
+ 1. Verify that when a user has configured a system, it is not possible to go back to retail mode
 STEPS:
- 1. Select a language for the account (English)
+ 1. During installation OOBE, select a language for the account (English)
 2. Set up networking (or skip)
 3. Select a timezone
 4. Select a keyboard layout
 5. Create an account (name/password). Leave Require my password to log in
- 6. Select a picture
- 7. Once the configuration finishes, the system reboots
+ 6. Once the configuration finishes, do not finish installation and reboot system
+ 7. Long press Ctrl+Shift+Alt (all left) during OOBE Plymouth
 VERIFICATION:
- 1. The user account exists
- 2. The retail mode account does not exists
+ 1. The retail mode account should not exist, user should not be able to enter retail mode in step 7
+ 2. The user account created in step 5 should already exist
 3. In Unity-Greeter, typing Ctrl+Shift+Alt does not expose the admin account
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.2
+ 2. RETAIL-NON-UR-ENGLISH-0010, RETAIL-RECOVERY-ENGLISH-0010, RETAIL-NON-UR-CHINESE-0011
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/language-flexible
@@ -215,29 +233,38 @@ _description:
 PURPOSE:
 1. Verify that retail mode have flexible installation of region appropriate content
 STEPS:
- 1. Enable Retail mode and log out to contiune next steps
- 2. In the Log-In screen press simultaneously Ctrl+Shift+Alt, A new menu, “Configure this system” appears
- 3. Click on “Configure this system “ and type “oem” as password
- 4. The “admin” session will be started, Double-click on “Reconfigure System Settings” in the desktop, Password should be “oem”
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When screen switches to login screen press Ctrl+Shift+Alt simultaneously to login as the hidden OEM user
+ 4. The “admin” session will be started. Double-click on “Reconfigure System Settings” in the desktop (password is be “oem”)
 5. Configure retail mode using the wizard:
- 6. Select the language for retail mode, Select your timezone, Select a keyboard layout
- 7. Shutdown the system and Boot up the system
+ 6. Select "Chinese" as language, timezone, and a keyboard layout
+ 7. Shutdown the system and boot up the system
 VERIFICATION:
- 1. Unity Greeter and the Guest Session are in Chinese
+ 1. Unity Greeter and the guest retail mode session should be in Chinese
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.14
+ 2. RETAIL-NON-UR-CHINESE-0003
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/localization-sample
 _description:
 PURPOSE:
- 1. Verify that retail mode include localization of sample content
+ 1. Verify that retail mode includes localization of sample content
 STEPS:
- 1. Enable retail mode and check Documents folder
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When screen switches to login screen press Ctrl+Shift+Alt simultaneously to login as the hidden OEM user
+ 4. The “admin” session will be started. Double-click on “Reconfigure System Settings” in the desktop (password is be “oem”)
+ 5. Configure retail mode using the wizard:
+ 6. Select "Chinese" as language, timezone, and a keyboard layout
+ 7. Shutdown the system and boot up the system
+ 8. Check Documents folder
 VERIFICATION:
- 1. Does the Documents folder include Chinese content?
+ 1. "Documents" folder contents should be in Chinese
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.3.15
+ 2. RETAIL-NON-UR-CHINESE-0004
 
 plugin: manual
 id: kittyhawk/consumer/retail-mode/no-ubuntu-one
@@ -246,10 +273,9 @@ _description:
 1. Verify that Ubuntu One should be completely removed in consumer mode
 STEPS:
 1. Install image
- 2. When reaching OOBE, reboot system
- 3. When the screen shows Ubuntu & dots, long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
- 4. When screen switches to login screen, use user=oem, password=oem to login to retail mode
- 5. Check if Ubuntu One exists in consumer retail mode
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When screen switches to login screen, press enter to enter retail mode as "guest"
+ 4. Check if Ubuntu One exists in consumer retail mode
 VERIFICATION:
 1. Ubuntu One cloud icon should not be shown at desktop panel
 2. Ubuntu One should not exist in launcher
@@ -257,3 +283,41 @@ _description:
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #2.1.3
 
+plugin: manual
+id: kittyhawk/consumer/retail-mode/demo
+_description:
+ PURPOSE:
+ 1. Verify that retail mode demo contents are correctly displayed
+ STEPS:
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When unity Greeter with “Guest Session” option is being shown, press enter
+ 4. Check if all demo files (pictures, videos, ,documents) are correct by repeating the following steps for each demo content:
+ 5. Launch each of the following folders: Pictures, Videos, Documents, Music from Nautilus Home directory
+ 6. Check if each folder contains corresponding picture/video/PDF or LibreOffice/audio files
+ 7. Double-click files in each folder and check if they can be viewed or played
+ VERIFICATION:
+ 1. Each folder should not be empty and should contain demo files
+ 2. Demo files should be able to be correctly viewed or played
+ NOTES:
+ 1. RETAIL-NON-UR-ENGLISH-0004, RETAIL-RECOVERY-ENGLISH-0004, RETAIL-NON-UR-CHINESE-0005
+ 2. RETAIL-NON-UR-ENGLISH-0005, RETAIL-RECOVERY-ENGLISH-0005, RETAIL-NON-UR-CHINESE-0006
+ 3. RETAIL-NON-UR-ENGLISH-0006, RETAIL-RECOVERY-ENGLISH-0006, RETAIL-NON-UR-CHINESE-0007
+ 4. RETAIL-NON-UR-ENGLISH-0007, RETAIL-RECOVERY-ENGLISH-0007, RETAIL-NON-UR-CHINESE-0008
+
+plugin: manual
+id: kittyhawk/consumer/retail-mode/limited-power-settings
+_description:
+ PURPOSE:
+ 1. Verify that Shutdown/Suspend/Hibernate are disabled in retail mode
+ STEPS:
+ 1. Install image
+ 2. When installation reaches OOBE Plymouth (Ubuntu logo with dots), long press Ctrl+Shift+Alt (all left) and keep the keys pressed until you hear a sound
+ 3. When screen switches to login screen, press enter to enter retail mode as "guest"
+ 4. Click on the power indicator icon
+ VERIFICATION:
+ 1. Suspend/Hibernate/Shutdown options should not be available in step 4
+ 2. Log Out option should be available in step 4
+ NOTES:
+ 1. RETAIL-NON-UR-ENGLISH-0008, RETAIL-RECOVERY-ENGLISH-0008, RETAIL-NON-UR-CHINESE-0009
+
diff --git a/jobs/kittyhawk/kylin.txt.in b/jobs/kittyhawk/kylin.txt.in
index 7b4c7da..06da233 100644
--- a/jobs/kittyhawk/kylin.txt.in
+++ b/jobs/kittyhawk/kylin.txt.in
@@ -25,22 +25,28 @@ _description:
 PURPOSE:
 1. Verify the package repository for UbuntuKylin-specific updates
 STEPS:
- 1. Open /etc/apt/sources.list.d/precise-kylin.list
+ 1. cat /etc/apt/sources.list.d/trusty-oem-kylin.list
+ 2. cat /etc/apt/sources.list.d/trusty-oem.list
 VERIFICATION:
- 1. There are "deb http://oem.archive.canonical.com/updates precise-ubuntukylin public" and "deb-src http://oem.archive.canonical.com/updates precise-ubuntukylin public" included
+ 1. There are Kylin specific sources (deb & deb-src) included in step 1
+ 2. archive.ubuntukylin.com (with its key) is included in step 1 (TBD)
+ 3. There are generic OEM sources (deb & deb-src) included in step 2
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.8.1, #3.8.2
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.8.1, #3.8.2, #3.1.5
 
 plugin: manual
 id: kittyhawk/kylin/theme
 _description:
 PURPOSE:
- 1. Verifiy Kylin theme for system: unity greeter, icon theme, desktop background, plymouth splash screen
+ 1. Verifiy Kylin theme for system: unity greeter, icon theme, desktop background, plymouth splash screen & grub background
 STEPS:
 1. Install the system and complete oem-config setup
 2. Log in to system and check system theme
 VERIFICATION:
- 1. Verify system theme is Kylin theme including unity greeter, icon theme, desktop background, plymouth splash screen
+ 1. Boot into Kylin OS
+ 2. Verify system theme is Kylin theme including unity greeter, icon theme, desktop background, plymouth splash screen
+ 3. Reboot system and press ESC after reaching bootloader
+ 4. Verify that the grub background is Kylin theme
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.4.1
 
@@ -62,3 +68,21 @@ _description:
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.4.2
 
+plugin: manual
+id: kittyhawk/kylin/overlay
+_description:
+ PURPOSE:
+ 1. Verify that the Kylin overlay merges correctly with Kittyhawk image
+ STEPS:
+ 1. download both non-kylin and kylin image.
+ 2. download overlay creator script: lp:~oem-solutions-group/kittyhawk/kittyhawk-kylin-overlay-generator
+ 3. using command "./kittyhawk-kylin-overlay-generator [+R.iso] [kylin.iso]" to make the overlay.tar.gz, the tarball will be in /tmp/overlay.tar.gz
+ 4. install non-kylin +R image into a testing machine
+ 5. mount non-kylin's recovery partition and untar overlay.tar.gz to it.
+ 6. reboot the test machine and press F9
+ 7. check if the system overlay to kylin.
+ VERIFICATION:
+ 1. It should be kittyhawk-kylin after step 7
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.1.2
+
diff --git a/jobs/kittyhawk/kylin/Core.txt.in b/jobs/kittyhawk/kylin/Core.txt.in
deleted file mode 100644
index 79be1e5..0000000
--- a/jobs/kittyhawk/kylin/Core.txt.in
+++ /dev/null
@@ -1,24 +0,0 @@
-plugin: manual
-id: kittyhawk/kylin/core/base-image-version
-_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)
-
-plugin: manual
-id: kittyhawk/kylin/core/recovery
-_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/kittyhawk/kylin/applications.txt.in b/jobs/kittyhawk/kylin/applications.txt.in
index 65aeae6..d8efda5 100644
--- a/jobs/kittyhawk/kylin/applications.txt.in
+++ b/jobs/kittyhawk/kylin/applications.txt.in
@@ -4,9 +4,11 @@ _description:
 PURPOSE:
 1. Verify the Chinese lunar calendar application is installed
 STEPS:
- 1. Click the Calendar icon in indicators area on the top right corner of the Desktop
+ 1. Click the calendar icon in indicators area on the top right corner of the Desktop
+ 2. Check calendar version with command "dpkg -l | grep chinese-calendar"
 VERIFICATION:
 1. Verify Chinese lunar calendar can be expanded and unexpanded
+ 2. Verify that the Chinese lunar calendar content is correct & display is not corrupted
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.5.3
 
@@ -16,9 +18,12 @@ _description:
 PURPOSE:
 1. Verify the weather forecast indicator is installed
 STEPS:
- 1. Click the weather forecast icon in indicators area on the top right corner of the Desktop
+ 1. Click the weather forecast icon in indicators area on the top right corner of the Desktop and set location
+ 2. Check weather indicator version with command "dpkg -l | grep indicator-china-weather"
 VERIFICATION:
 1. Verify user can set weather forecast according to selected locale
+ 2. Verify that weather info correctly corresponds to selected location
+ 3. Verify that indicator-china-weather version is correct
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.5.4
 
@@ -26,12 +31,15 @@ plugin: manual
 id: kittyhawk/kylin/applications/input-method
 _description:
 PURPOSE:
- 1. Verify the input method is fcitx with Suogu engine
+ 1. Verify the input method is fcitx with Sougu engine
 STEPS:
 1. Click the input method icon in indicators area on the top right corner of the Desktop
+ 2. Launch sytem settings > Language support (语言支持)
 VERIFICATION:
- 1. Verify the input method is fcitx instead of ibus
- 2. Verify input method works and can switch between Chinese and English
+ 1. The input method is fcitx instead of ibus
+ 2. Input method works and can switch between Chinese and English
+ 3. Sougu engine is available in input method drop list
+ 4. "Language(语言)" tab > "Keyboard input method system(键盘输入方式系统)" default value should be "fcitx" in step 2
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.6.1
 
@@ -39,12 +47,14 @@ plugin: manual
 id: kittyhawk/kylin/applications/youker-assistant
 _description:
 PURPOSE:
- 1. Verify that youker-assistant is included
+ 1. Verify that youker-assistant (优客助手) is included
 STEPS:
 1. Install Kylin image
- 2. Verify that Youker Assistant is included
+ 2. In Dash, enter "Youker" or "优客助手"
+ 3. Verify that Youker Assistant is included
+ 4. Launch Youker Assistant and make sure contents are correct
 VERIFICATION:
- 1. Youker Assistant should be included
+ 1. Youker Assistant should be included and contents should work
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.5.2
 
@@ -52,12 +62,12 @@ plugin: manual
 id: kittyhawk/kylin/applications/localization
 _description:
 PURPOSE:
- 1. Verify the localization of Firefox, Thunderbird and LibreOffice
+ 1. Verify the localization of Chromium, Thunderbird and LibreOffice
 STEPS:
 1. Install Kylin image
- 2. Launch Firefox, Thunderbird & LibreOffice
+ 2. Launch Chromium, Thunderbird & LibreOffice
 VERIFICATION:
- 1. Firefox, Thunderbird & LibreOffice contents should be localized to Chinese characters
+ 1. Chromium, Thunderbird & LibreOffice contents should be localized to Chinese characters
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.6.2
 
@@ -75,6 +85,7 @@ _description:
 2. input method should be fcitx instead of ibus in step 3
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.9.1
+ 2. https://bugs.launchpad.net/kittyhawk/+bug/1293390 comment #5: due to dependency to ibus in unity, ibus related packages cannot be removed completely, so the current workaround is to set indicator-keyboard icon invisible. If ibus indicator is invisible then this case can count as passed in Kittyhawk.
 
 plugin: manual
 id: kittyhawk/kylin/applications/no-ubuntu-one
@@ -114,10 +125,13 @@ _description:
 PURPOSE:
 1. Verifiy the China photo scope for searching Chinese photos
 STEPS:
- 1. Open Dash on the top of Launcher bar
- 2. Type chinese photo name in search bar
+ 1. Launch terminal and execute "dpkg -l | grep unity-china"
+ 2. Make sure the network is connected
+ 3. Open Dash on the top of Launcher bar, select "photo" icon at bottom of dash menu
+ 4. Type keyword in search bar (ex. "nikon" or "尼康")
 VERIFICATION:
- 1. Related photos are shown under the search bar
+ 1. unity-china-photo-scope should be listed in output of step 1
+ 2. Related Chinese scope photos should be listed under the search bar in step 2
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.5.1
 
@@ -127,11 +141,13 @@ _description:
 PURPOSE:
 1. Verifiy the China Music Scope for searching Chinese music
 STEPS:
- 1. Open Dash on the top of Launcher bar
- 2. Type chinese music name in search bar
+ 1. Launch terminal and execute "dpkg -l | grep unity-china"
+ 2. Make sure the network is connected
+ 3. Open Dash on the top of Launcher bar, select "music" icon at bottom of dash menu
+ 4. Type keyword in search bar (ex. "jay" or "周杰伦")
 VERIFICATION:
- 1. Related music are showing under the search bar
- 2. Click the music which links to music.baidu.com
+ 1. unity-china-music-scope should be listed in output of step 1
+ 2. Related Chinese scope music should be listed under the search bar in step 2
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.5.1
 
@@ -139,12 +155,46 @@ plugin: manual
 id: kittyhawk/kylin/applications/china-video-scope
 _description:
 PURPOSE:
- 1. Verifiy the China video scope for searching Chinese photos
+ 1. Verifiy the China video Scope for searching Chinese video
 STEPS:
- 1. Open Dash on the top of Launcher bar
- 2. Type chinese video name in search bar
+ 1. Launch terminal and execute "dpkg -l | grep unity-china"
+ 2. Make sure the network is connected
+ 3. Open Dash on the top of Launcher bar, select "video" icon at bottom of dash menu
+ 4. Type keyword in search bar (ex. "jay" or "周杰伦")
 VERIFICATION:
- 1. Related videos are shown under the search bar
+ 1. unity-china-video-scope should be listed in output of step 1
+ 2. Related Chinese scope videos should be listed under the search bar in step 2
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.5.1
 
+plugin: manual
+id: kittyhawk/kylin/applications/ubuntu-kylin-docs
+_description:
+ PURPOSE:
+ 1. Verify that Ubuntu Help docs are in Chinese.
+ STEPS:
+ 1. Log into Kylin OS
+ 2. Launch Dash, enter "help" and launch the Help application
+ 3. Check the contents of the Help application
+ VERIFICATION:
+ 1. Ubuntu Help docs should be in Chinese
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.6.3
+
+plugin: manual
+id: kittyhawk/kylin/applications/software-center
+_description:
+ PURPOSE:
+ 1. Verify that Ubuntu Kylin Software Center is installed but not visible in the Launcher
+ STEPS:
+ 1. Log into Kylin OS
+ 2. Check if Ubuntu Kylin Software Center icon is shown in Launcher
+ 3. Launch Ubuntu Kylin Software Center from Dash
+ 4. Try installing any application from Ubuntu Kylin Software Center
+ VERIFICATION:
+ 1. Ubuntu Kylin Software Center icon should not be shown in the Launcher
+ 2. Ubuntu Kylin Software Center should be able to be launched from Dash
+ 3. Application installation via Ubuntu Kylin Software Center should be successful
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.5.7
+
diff --git a/jobs/kittyhawk/kylin/core.txt.in b/jobs/kittyhawk/kylin/core.txt.in
new file mode 100644
index 0000000..fb4c513
--- /dev/null
+++ b/jobs/kittyhawk/kylin/core.txt.in
@@ -0,0 +1,27 @@
+plugin: manual
+id: kittyhawk/kylin/core/base-image
+_description:
+ PURPOSE:
+ 1. Verify that base is 14.04 OEM image
+ STEPS:
+ 1. Install the system and power on the device after installation complete
+ 2. execute command "lsb_release -a"
+ VERIFICATION:
+ 1. make sure output of command indicates that base image version is 14.04 OEM image
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.1.1
+
+plugin: manual
+id: kittyhawk/kylin/core/recovery
+_description:
+ PURPOSE:
+ 1. Verify that Kylin system can recover back to Kylin
+ STEPS:
+ 1. Install the system
+ 2. Reboot the system and press esc or shift+esc to enter grub menu before entering OS
+ 3. After entering grub, press F9 to start Ubuntu recovery
+ VERIFICATION:
+ 1. When Ubuntu recovery is complete, system should still be Kylin
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.1.4
+
diff --git a/jobs/kittyhawk/kylin/installer.txt.in b/jobs/kittyhawk/kylin/installer.txt.in
index 9c03bbe..25d5aa9 100644
--- a/jobs/kittyhawk/kylin/installer.txt.in
+++ b/jobs/kittyhawk/kylin/installer.txt.in
@@ -5,10 +5,11 @@ _description:
 1. Verify that OS installer should be fully translated in supported languages: English, Simplified Chinese
 STEPS:
 1. Launch OS installer and follow instruction to install OS
- 2. In language selection page, select one of the following languages: English, Simplified Chinese
+ 2. In language selection page, select one of the following languages: Simplified Chinese
 3. Continue the install
+ 4. Repeat step 1 ~ 3 but select English in step 2
 VERIFICATION:
- 1. OS installer shall be fully translated in selected language: Simplified Chinese (zh_CN) or English
+ 1. OS installer shall be fully translated in selected language: Simplified Chinese (zh_CN) or English in "ubiquity" & "oem-config"
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.2.1
 
@@ -21,6 +22,7 @@ _description:
 1. Check the default langauge in language selection step
 VERIFICATION:
 1. It should be Simplified Chinese which is highlighted
+ 2. All related text should be in simplified Chinese during installation process if user uses default language
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.2.2
 
diff --git a/jobs/kittyhawk/kylin/oobe.txt.in b/jobs/kittyhawk/kylin/oobe.txt.in
index 1b6c256..8a76a48 100644
--- a/jobs/kittyhawk/kylin/oobe.txt.in
+++ b/jobs/kittyhawk/kylin/oobe.txt.in
@@ -1,5 +1,5 @@
 plugin: manual
-id: kittyhawk/kylin/oobe/initial-setup
+id: kittyhawk/kylin/oobe/all-languages
 _description:
 PURPOSE:
 1. Verify the first time end-user starts the device the setup shall default to Simplified Chinese.
@@ -14,16 +14,19 @@ plugin: manual
 id: kittyhawk/kylin/oobe/slideshow
 _description:
 PURPOSE:
- 1. Verify the first time end-user boots a machine with UbuntuKylin installed, the user should see the Kylin slideshow
+ 1. Verify the first time end-user boots a machine with Ubuntu Kylin installed, the user should see the Kylin slideshow
 STEPS:
- 1. Install the system and power on the device after installation complete
+ 1. Install the system
+ 2. Check the slideshows displayed after the first boot
+ 3. After OOBE, complete the required steps and check the slideshows displayed afterwards
 VERIFICATION:
- 1. Kylin slideshow diplays during OOBE
+ 1. Kylin specific slideshow should be displayed before OOBE
+ 2. Kylin specific slideshow should be displayed during OOBE
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.3.2
 
 plugin: manual
-id: kittyhawk/kylin/oobe/ubuntu1
+id: kittyhawk/kylin/oobe/no-ubuntu1
 _description:
 PURPOSE:
 1. Verify that U1 signup screen shouldn't appear during OOBE
diff --git a/jobs/kittyhawk/kylin/third-party-add-on.txt.in b/jobs/kittyhawk/kylin/third-party-add-on.txt.in
index 57cdc48..ef98596 100644
--- a/jobs/kittyhawk/kylin/third-party-add-on.txt.in
+++ b/jobs/kittyhawk/kylin/third-party-add-on.txt.in
@@ -2,15 +2,17 @@ plugin: manual
 id: kittyhawk/kylin/third-party-add-on/fonts
 _description:
 PURPOSE:
- 1. Verify the default Chinese font is Hanyi
+ 1. Verify the default Chinese font is Hanyi (汉仪)
 STEPS:
 1. Launch "LibreOffice Writer"
 3. Choose "汉仪宋体" or "汉仪楷体"
 4. Start Chinese Input Method by pressing [CTRL]+[SPACE]
 5. Input some Chinese characters
+ 6. Check if the Chinese characters used in Kylin OS are also Hanyi
 VERIFICATION:
 1. The font is "Hanyi"?
- 2. Chinese characters are in "汉仪宋体" or "汉仪楷体" font
+ 2. Chinese characters are in "汉仪宋体" or "汉仪楷体" font in step 5
+ 3. Chinese characters used in Kylin OS are also Hanyi
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.7.4, #3.1.3
 
@@ -18,12 +20,20 @@ plugin: manual
 id: kittyhawk/kylin/third-party-add-on/office-suite
 _description:
 PURPOSE:
- 1. Verify the WPS Office Suite from Kingsoft is installed
+ 1. Verify that the WPS Office Suite from Kingsoft is installed and launcher is displayed.
+ 2. Verify that LibreOffice launcher icons are removed from launcher, but app is still pre-installed.
 STEPS:
- 1. Log in to system and click Writer, Presentation and Spreadsheet icons on the Launcher bar
+ 1. Log in to system
+ 2. Check Kingsoft package version with command "dpkg -l | grep kingsoft-office"
+ 3. Click Writer, Presentation and Spreadsheet icons on the Launcher bar
+ 4. Check if LibreOffice icons exist in Launcher bar
+ 5. Launch Dash and enter "calc", "impress", "writer"
 VERIFICATION:
- 1. WPS Writer, Presentation, Spreadsheet and Kuaipan icons must be added to the Unity launcher. LibreOffice icons should be removed.
- 2. WPS Writer, Presentation and Spreadsheet are opened correctly
+ 1. Kingsoft version should be correct in step 2
+ 2. WPS Writer, Presentation, Spreadsheet icons must be added to the Unity launcher in step 3
+ 3. WPS Writer, Presentation, Spreadsheet can be correctly launched and works correctly in step 3
+ 4. LibreOffice icons should be removed from launcher, in step 4
+ 5. LibreOffice apps should still be pre-installed and can be successfully launched in step 5
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.7.1, #3.7.2
 
@@ -48,25 +58,31 @@ plugin: manual
 id: kittyhawk/kylin/third-party-add-on/baidu-default-home-page
 _description:
 PURPOSE:
- 1. Verify Baidu is the default browser home page
+ 1. Verify that the default Search Engine should be Baidu and use our affiliate code.
+ 2. Verify that the default start page should be start.ubuntu.com which points (at the moment) to Baidu and contains Canonical's affiliate code.
 STEPS:
- 1. Click "Firefox Web Browser" from the Launcher bar
+ 1. Click the default browser icon from the Launcher bar
 VERIFICATION:
- 1. The default home page is Baidu
- 2. Home page URL is http://start.ubuntu.com which points (at the moment) to Baidu and contains Canonical's affiliate code.
+ 1. The default home page is http://start.ubuntu.com/14.04/Baidu/
+ 2. The default hope page should be Baidu Search, with Ubuntu logo at top of search bar and Ubuntu help, Ubuntu store & Ubuntu community links at bottom of search bar.
+ 3. The browser's toolbar search should be Baidu, search results should also be Baidu search result page
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.7.6
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.7.5, #3.7.6
 
 plugin: manual
 id: kittyhawk/kylin/third-party-add-on/Kingsoft-Kuaipan
 _description:
 PURPOSE:
- 1. Verify that Kingsoft Kuaipan cloud file syncing application is included
+ 1. Verify that Kingsoft Kuaipan (金山快盘) cloud file syncing application is included
 STEPS:
 1. Install Kylin Image
- 2. Make sure Kingsoft Kuaipan cloud file syncing application is included
+ 2. Click the "Kingsoft Kuaipan (金山快盘)" icon in the launcher
+ 3. Check that "Kingsoft Kuaipan (金山快盘)" works correctly
+ 4. Check "Kingsoft Kuaipan (金山快盘)" version with command "dpkg -l | grep kuaipan"
 VERIFICATION:
- 1. Kingsoft Kuaipan cloud file syncing application is included
+ 1. Kingsoft Kuaipan cloud file syncing application is included, a "Kingsoft Kuaipan (金山快盘)" icon should exist in launcher in step 2
+ 2. "Kingsoft Kuaipan (金山快盘)" can be launched and should work correctly in step 3
+ 3. "Kingsoft Kuaipan (金山快盘)" version should be correct in step 4
 NOTES:
- 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.7.7
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.7.7, #3.7.2