* Updates for Kittyhawk:

 * (1) remove redundant job kittyhawk/kylin/support-and-maintenance.txt.in * (2) modify details in test case kittyhawk/kylin/support-and-maintenance * (3) update job file & whitelist for previously missing test case kittyhawk/baseOS/core/disable-hwe-upgrades

5 files changed, 29 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 9fb116a..8c4e940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+plainbox-provider-oem (0.1ubuntu18) UNRELEASED; urgency=medium
+
+ * Updates for Kittyhawk:
+ * (1) remove redundant job kittyhawk/kylin/support-and-maintenance.txt.in
+ * (2) modify details in test case kittyhawk/kylin/support-and-maintenance
+ * (3) update job file & whitelist for previously missing test case kittyhawk/baseOS/core/disable-hwe-upgrades
+
+ -- KristinChuang <kristin.chuang@canonical.com> Mon, 21 Jul 2014 11:02:52 +0800
+
 plainbox-provider-oem (0.1ubuntu17) trusty; urgency=high
 
 * bump version to merge Erin and Elsa's modification of the whitelist
diff --git a/jobs/kittyhawk/baseOS/core.txt.in b/jobs/kittyhawk/baseOS/core.txt.in
index 018e7c0..bc4dc46 100644
--- a/jobs/kittyhawk/baseOS/core.txt.in
+++ b/jobs/kittyhawk/baseOS/core.txt.in
@@ -12,12 +12,27 @@ _description:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.1.1
 
 plugin: manual
+id: kittyhawk/baseOS/core/disable-hwe-upgrades
+_description:
+ PURPOSE:
+ 1. Verify that the HWE stack "update available" notification is disabled
+ STEPS:
+ 1. check if file /var/lib/update-notifier/disable-eol-messages exist
+ 2. additional test steps TBD
+ VERIFICATION:
+ 1. file /var/lib/update-notifier/disable-eol-messages should exist
+ 2. addtional verification steps TBD
+ NOTES:
+ 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #1.1.21
+ 2. https://wiki.ubuntu.com/Hwestackeolnotifications
+
+plugin: manual
 id: kittyhawk/baseOS/core/managed-upgrades
 _description:
 PURPOSE:
 1. Verify that the default turns off automatic notification of new versions of Ubuntu (including LTS)
 STEPS:
- 1. Launch Update Manager by finding "Software & Updates" in Dash,
+ 1. Launch Update Manager by finding "Software & Updates" in Dash
 2. Check default value of "Notify me of a new Ubuntu version" in the "Updates" tab
 VERIFICATION:
 1. Value should be 'Never'
diff --git a/jobs/kittyhawk/kylin.txt.in b/jobs/kittyhawk/kylin.txt.in
index 06da233..7c83fdf 100644
--- a/jobs/kittyhawk/kylin.txt.in
+++ b/jobs/kittyhawk/kylin.txt.in
@@ -28,9 +28,9 @@ _description:
 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 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
+ 1. There are Kylin specific sources (deb & deb-src) listed in step 1
+ 2. deb & deb-src from archive.ubuntukylin.com are listed in step 1
+ 3. There are generic OEM sources (deb & deb-src) listed in step 2
 NOTES:
 1. Kitty Hawk 1.0 (OEM 14.04 LTS) PRD #3.8.1, #3.8.2, #3.1.5
 
diff --git a/jobs/kittyhawk/kylin/support-and-maintenance.txt.in b/jobs/kittyhawk/kylin/support-and-maintenance.txt.in
deleted file mode 100644
index e69de29..0000000
--- a/jobs/kittyhawk/kylin/support-and-maintenance.txt.in
+++ /dev/null
diff --git a/whitelists/kittyhawk-prd-items.whitelist b/whitelists/kittyhawk-prd-items.whitelist
index 008411e..8a9f5b3 100644
--- a/whitelists/kittyhawk-prd-items.whitelist
+++ b/whitelists/kittyhawk-prd-items.whitelist
@@ -36,6 +36,7 @@ kittyhawk/baseOS
 kittyhawk/baseOS/core
 kittyhawk/baseOS/core/64bit
 kittyhawk/baseOS/core/managed-upgrades
+kittyhawk/baseOS/core/disable-hwe-upgrades
 kittyhawk/baseOS/core/kernel-version
 kittyhawk/baseOS/core/UEFI
 kittyhawk/baseOS/secure-boot