provider:checkbox use hardware manifest for touchscreen tests

Use the hardware manifest to determine touchscreen availability.

2 files changed, 23 insertions, 8 deletions

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 54f01c6..3785262 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -2535,6 +2535,8 @@ _description:
 plugin: manual
 category_id: 2013.com.canonical.plainbox::suspend
 id: touchscreen/touchscreen_after_suspend
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 depends: suspend/suspend_advanced_auto
 estimated_duration: 30.0
 _description:
diff --git a/jobs/touchscreen.txt.in b/jobs/touchscreen.txt.in
index 53fd582..94b6e2f 100644
--- a/jobs/touchscreen.txt.in
+++ b/jobs/touchscreen.txt.in
@@ -1,3 +1,8 @@
+unit: manifest entry
+id: has_touchscreen
+_name: Touchscreen
+value-type: bool
+
 plugin: shell
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/nontouch-automated
@@ -34,7 +39,8 @@ _description:
 plugin: manual
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/tap-detect
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -47,7 +53,8 @@ _description:
 plugin: manual
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/drag-n-drop
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -62,7 +69,8 @@ plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/multitouch-zoom
 _summary: Check touchscreen pinch gesture for zoom
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 command: qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_zoom_test.qml 2>&1 |grep -o PASS
 estimated_duration: 120.0
 _description:
@@ -78,7 +86,8 @@ plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/multitouch-rotate
 _summary: Check touchscreen pinch gesture for rotate
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 command: qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_rotate_test.qml 2>&1 |grep -o PASS
 estimated_duration: 120.0
 _description:
@@ -93,7 +102,8 @@ _description:
 plugin: manual
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/multitouch-window-move
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -107,7 +117,8 @@ _description:
 plugin: manual
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/multitouch-dash
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -120,7 +131,8 @@ _description:
 plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/3-touch-tap
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 estimated_duration: 15.0
 _description:
 PURPOSE:
@@ -141,7 +153,8 @@ command:
 plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::touchscreen
 id: touchscreen/4-touch-tap
-depends: touchscreen/multitouch-automated
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_touchscreen == 'True'
 estimated_duration: 15.0
 _description:
 PURPOSE: