kittyhawk: use PLAINBOX_PROVIDER_DATA env for local plugin

8 files changed, 38 insertions, 38 deletions

diff --git a/jobs/kittyhawk/kittyhawk.txt.in b/jobs/kittyhawk/kittyhawk.txt.in
index 8673187..7fa3992 100644
--- a/jobs/kittyhawk/kittyhawk.txt.in
+++ b/jobs/kittyhawk/kittyhawk.txt.in
@@ -1,30 +1,30 @@
 plugin: local
 id: kittyhawk/baseOS
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS.txt*
 _description: Base OS verification
 
 plugin: local
 id: kittyhawk/consumer-CHN
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer-CHN.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer-CHN.txt*
 _description: Consumer Desktop for China feature verification
 
 plugin: local
 id: kittyhawk/business
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/business.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/business.txt*
 _description: Business Desktop feature verification
 
 plugin: local
 id: kittyhawk/consumer
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer.txt*
 _description: Consumer Desktop feature verification
 
 plugin: local
 id: kittyhawk/kylin
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/kylin.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/kylin.txt*
 _description: UbuntuKylin feature verification
 
 plugin: local
 id: kittyhawk/bugs
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/bugs.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/bugs.txt*
 _description: Verification of Kittyhawk bugs
 
diff --git a/jobs/kittyhawk/kittyhawk/baseOS.txt.in b/jobs/kittyhawk/kittyhawk/baseOS.txt.in
index eb77146..e17e81b 100644
--- a/jobs/kittyhawk/kittyhawk/baseOS.txt.in
+++ b/jobs/kittyhawk/kittyhawk/baseOS.txt.in
@@ -1,77 +1,77 @@
 plugin: local
 id: kittyhawk/baseOS/core
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/core.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/core.txt*
 _description: Core verification
 
 plugin: local
 id: kittyhawk/baseOS/startup
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/startup.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/startup.txt*
 _description: System Startup verification
 
 plugin: local
 id: kittyhawk/baseOS/installer
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/installer.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/installer.txt*
 _description: OS Installer verification
 
 plugin: local
 id: kittyhawk/baseOS/oobe
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/oobe.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/oobe.txt*
 _description: Out of box experience verification
 
 plugin: local
 id: kittyhawk/baseOS/keyboard-shortcuts
 command:
- cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/keyboard-shortcuts.txt*
+ cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/keyboard-shortcuts.txt*
 _description: Unity UI keyboard shortcuts verification
 
 plugin: local
 id: kittyhawk/baseOS/launcher
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/launcher.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/launcher.txt*
 _description: Launcher Bar verification
 
 plugin: local
 id: kittyhawk/baseOS/applications
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/applications.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/applications.txt*
 _description: Applications verification
 
 plugin: local
 id: kittyhawk/baseOS/third-party-add-on
 command:
- cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/third-party-add-on.txt*
+ cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/third-party-add-on.txt*
 _description: Third-party add-ons verification
 
 plugin: local
 id: kittyhawk/baseOS/graphics
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/graphics.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/graphics.txt*
 _description: Generic tests on graphics cards
 
 plugin: local
 id: kittyhawk/baseOS/benchmark
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/benchmark.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/benchmark.txt*
 _description: Benchmarks
 
 plugin: local
 id: kittyhawk/baseOS/estar
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/estar.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/estar.txt*
 _description: To check power management settings are e-star compliant
 
 plugin: local
 id: kittyhawk/baseOS/canonical-poke
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/canonical-census.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/canonical-census.txt*
 _description: Canonical Census feature test
 
 plugin: local
 id: kittyhawk/baseOS/secure-boot
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/secure-boot.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/secure-boot.txt*
 _description: Secure Boot
 
 plugin: local
 id: kittyhawk/baseOS/hardware-support
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/hardware-support.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/hardware-support.txt*
 _description: Verify that system can support new feature
 
 plugin: local
 id: kittyhawk/baseOS/chipset-support
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/chipset-support.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/chipset-support.txt*
 _description: Verify that system can support new chipsets
 
diff --git a/jobs/kittyhawk/kittyhawk/baseOS/core.txt.in b/jobs/kittyhawk/kittyhawk/baseOS/core.txt.in
index c47524f..056e7a3 100644
--- a/jobs/kittyhawk/kittyhawk/baseOS/core.txt.in
+++ b/jobs/kittyhawk/kittyhawk/baseOS/core.txt.in
@@ -67,7 +67,7 @@ _description:
 
 plugin: local
 id: kittyhawk/baseOS/core/recovery
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/core/recovery.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/core/recovery.txt*
 _description: OS recovery verification
 
 plugin: manual
diff --git a/jobs/kittyhawk/kittyhawk/baseOS/oobe.txt.in b/jobs/kittyhawk/kittyhawk/baseOS/oobe.txt.in
index 407c31b..17b16b3 100644
--- a/jobs/kittyhawk/kittyhawk/baseOS/oobe.txt.in
+++ b/jobs/kittyhawk/kittyhawk/baseOS/oobe.txt.in
@@ -26,7 +26,7 @@ _description:
 plugin: local
 id: kittyhawk/baseOS/oobe/oem-config-settings
 command:
- cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/baseOS/oobe/oem-config-settings.txt*
+ cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/baseOS/oobe/oem-config-settings.txt*
 _description: oem-config
 
 plugin: manual
diff --git a/jobs/kittyhawk/kittyhawk/business.txt.in b/jobs/kittyhawk/kittyhawk/business.txt.in
index f0442d3..3525892 100644
--- a/jobs/kittyhawk/kittyhawk/business.txt.in
+++ b/jobs/kittyhawk/kittyhawk/business.txt.in
@@ -15,11 +15,11 @@ _description:
 
 plugin: local
 id: kittyhawk/business/applications
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/business/applications.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/business/applications.txt*
 _description: Applications verification
 
 plugin: local
 id: kittyhawk/business/third-party-add-on
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/business/third-party-add-on.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/business/third-party-add-on.txt*
 _description: Third-party add-ons verification
 
diff --git a/jobs/kittyhawk/kittyhawk/consumer-CHN.txt.in b/jobs/kittyhawk/kittyhawk/consumer-CHN.txt.in
index 6de3255..c8cfbb6 100644
--- a/jobs/kittyhawk/kittyhawk/consumer-CHN.txt.in
+++ b/jobs/kittyhawk/kittyhawk/consumer-CHN.txt.in
@@ -34,7 +34,7 @@ _description:
 
 plugin: local
 id: kittyhawk/consumer-CHN/oobe
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer-CHN/oobe.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer-CHN/oobe.txt*
 _description: Out of box experience verification
 
 plugin: manual
@@ -59,28 +59,28 @@ _description:
 
 plugin: local
 id: kittyhawk/consumer-CHN/launcher
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer-CHN/launcher.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer-CHN/launcher.txt*
 _description: Launcher Bar verification
 
 plugin: local
 id: kittyhawk/consumer-CHN/third-party-launcher
 command:
- cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer-CHN/third-party-launcher.txt*
+ cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer-CHN/third-party-launcher.txt*
 _description: Third-party launchers verification
 
 plugin: local
 id: kittyhawk/consumer-CHN/applications
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer-CHN/applications.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer-CHN/applications.txt*
 _description: Applications verification
 
 plugin: local
 id: kittyhawk/consumer-CHN/third-party-add-on
 command:
- cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer-CHN/third-party-add-on.txt*
+ cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer-CHN/third-party-add-on.txt*
 _description: Third-party add-ons verification
 
 plugin: local
 id: kittyhawk/consumer-CHN/localization
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer-CHN/localization.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer-CHN/localization.txt*
 _description: Localization
 
diff --git a/jobs/kittyhawk/kittyhawk/consumer.txt.in b/jobs/kittyhawk/kittyhawk/consumer.txt.in
index 5ba73fc..49fbf89 100644
--- a/jobs/kittyhawk/kittyhawk/consumer.txt.in
+++ b/jobs/kittyhawk/kittyhawk/consumer.txt.in
@@ -14,11 +14,11 @@ _description:
 
 plugin: local
 id: kittyhawk/consumer/retail-mode
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer/retail-mode.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer/retail-mode.txt*
 _description: Retail mode feature verification
 
 plugin: local
 id: kittyhawk/consumer/sample-content
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/consumer/sample-content.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/consumer/sample-content.txt*
 _description: Sample content in retail mode feature verification
 
diff --git a/jobs/kittyhawk/kittyhawk/kylin.txt.in b/jobs/kittyhawk/kittyhawk/kylin.txt.in
index f9a66fa..7b4c7da 100644
--- a/jobs/kittyhawk/kittyhawk/kylin.txt.in
+++ b/jobs/kittyhawk/kittyhawk/kylin.txt.in
@@ -1,22 +1,22 @@
 plugin: local
 id: kittyhawk/kylin/installer
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/kylin/installer.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/kylin/installer.txt*
 _description: UbuntuKylin OS installation verification
 
 plugin: local
 id: kittyhawk/kylin/oobe
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/kylin/oobe.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/kylin/oobe.txt*
 _description: Out of the box experience verification
 
 plugin: local
 id: kittyhawk/kylin/applications
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/kylin/applications.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/kylin/applications.txt*
 _description: Applications on UbuntuKylin verification
 
 plugin: local
 id: kittyhawk/kylin/third-party-add-on
 command:
- cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/kylin/third-party-add-on.txt*
+ cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/kylin/third-party-add-on.txt*
 _description: Third-party add-ons verification
 
 plugin: manual
@@ -46,7 +46,7 @@ _description:
 
 plugin: local
 id: kittyhawk/kylin/core
-command: cat ${CHECKBOX_OEM_KITTYHAWK_SHARE}/jobs/kittyhawk/kylin/core.txt*
+command: cat ${PLAINBOX_PROVIDER_DATA}/../jobs/kittyhawk/kylin/core.txt*
 _description: Core features verification
 
 plugin: manual