provider:checkbox: Fix requirements for USB Type-C related jobs

3 files changed, 10 insertions, 15 deletions

diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index 79b0445..fc7c4c4 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -154,7 +154,7 @@ id: audio/{index}_playback_type-c_displayport_{product_slug}
 imports: from 2013.com.canonical.plainbox import manifest
 estimated_duration: 30.0
 requires:
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
 display.dp == 'supported'
 device.category == 'AUDIO'
 package.name == 'alsa-base'
diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index 1502a14..f40908b 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -174,7 +174,7 @@ unit: template
 template-resource: graphics_card
 id: monitor/{index}_type-c_displayport_{product_slug}
 imports: from 2013.com.canonical.plainbox import manifest
-requires: manifest.has_usb_type_c
+requires: manifest.has_usb_type_c == 'True'
 estimated_duration: 15.0
 plugin: manual
 category_id: 2013.com.canonical.plainbox::monitor
diff --git a/jobs/usb.txt.in b/jobs/usb.txt.in
index 48e517b..1db807d 100644
--- a/jobs/usb.txt.in
+++ b/jobs/usb.txt.in
@@ -3,11 +3,6 @@ id: has_usb_type_c
 _name: USB Type-C Support
 value-type: bool
 
-unit: manifest entry
-id: has_usb_type_c_charging
-_name: USB Type-C Charging Port
-value-type: bool
-
 plugin: shell
 category_id: 2013.com.canonical.plainbox::usb
 id: usb/detect
@@ -51,7 +46,7 @@ plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::usb
 id: usb-c/c-to-a-adapter/hid
 imports: from 2013.com.canonical.plainbox import manifest
-requires: manifest.has_usb_type_c
+requires: manifest.has_usb_type_c == 'True'
 depends: usb/detect
 estimated_duration: 10.0
 command: keyboard_test
@@ -69,7 +64,7 @@ plugin: user-interact-verify
 category_id: 2013.com.canonical.plainbox::usb
 id: usb-c/hid
 imports: from 2013.com.canonical.plainbox import manifest
-requires: manifest.has_usb_type_c
+requires: manifest.has_usb_type_c == 'True'
 depends: usb/detect
 estimated_duration: 10.0
 command: keyboard_test
@@ -126,7 +121,7 @@ id: usb-c/c-to-a-adapter/insert
 imports: from 2013.com.canonical.plainbox import manifest
 requires:
 usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
 command: removable_storage_watcher -m 500000000 insert usb
 _purpose:
@@ -148,7 +143,7 @@ id: usb-c/insert
 imports: from 2013.com.canonical.plainbox import manifest
 requires:
 usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
 command: removable_storage_watcher -m 500000000 insert usb
 _purpose:
@@ -205,7 +200,7 @@ imports: from 2013.com.canonical.plainbox import manifest
 depends: usb-c/c-to-a-adapter/insert
 requires:
 usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
 command: removable_storage_watcher -m 500000000 remove usb
 _purpose:
@@ -226,7 +221,7 @@ imports: from 2013.com.canonical.plainbox import manifest
 depends: usb-c/insert
 requires:
 usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
 estimated_duration: 10.0
 command: removable_storage_watcher -m 500000000 remove usb
 _purpose:
@@ -305,7 +300,7 @@ id: usb-c/c-to-a-adapter/storage-automated
 imports: from 2013.com.canonical.plainbox import manifest
 requires:
 usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
 depends: usb-c/c-to-a-adapter/insert
 user: root
 estimated_duration: 45.0
@@ -320,7 +315,7 @@ id: usb-c/storage-automated
 imports: from 2013.com.canonical.plainbox import manifest
 requires:
 usb.usb3 == 'supported'
- manifest.has_usb_type_c
+ manifest.has_usb_type_c == 'True'
 depends: usb-c/insert
 user: root
 estimated_duration: 45.0