Merge ~sylvain-pineau/plainbox-provider-checkbox:has_camera_manifest into plainbox-provider-checkbox:master

[Sylvain Pineau]

units:camera: Use a new manifest to trigger the camera/detect job, has_camera

units:camera: Use a new manifest to trigger the camera/detect job, has_camera

It should prevent camera/detect running (and failing) on hw w/o a capture device set up.

[Sylvain Pineau (sylvain-pineau)]

Added camera/detect{,-rpi} as depends jobs for camera/roundtrip-qrcode. Thanks jinja!

Splitting the jobs looks not so easy, one titled with mmal and the other with something else...

review: Needs Resubmitting

[Jonathan Cave (jocave)]

LGTM, thanks.

We need to make sure any manifests that will need this addition get it.

review: Approve

diff --git a/units/camera/jobs.pxu b/units/camera/jobs.pxu
index 7c0b1d0..285fc2e 100644
--- a/units/camera/jobs.pxu
+++ b/units/camera/jobs.pxu
@@ -2,8 +2,9 @@ plugin: shell
 category_id: com.canonical.plainbox::camera
 id: camera/detect
 estimated_duration: 1.2
+imports: from com.canonical.plainbox import manifest
 requires:
- device.category == 'CAPTURE'
+  manifest.has_camera == 'True'
 command:
   camera_test.py detect
 _summary: This Automated test attempts to detect a camera.
@@ -144,6 +145,12 @@ category_id: com.canonical.plainbox::camera
 id: camera/roundtrip-qrcode_{{ name }}
 _summary: Test video output and camera {{ name }} by displaying and reading a qrcode
 estimated_duration: 5.0
+depends:
+  {%- if category == 'MMAL' %}
+  camera/detect-rpi
+  {%- else %}
+  camera/detect
+  {% endif -%}
 requires:
   {%- if __on_ubuntucore__ %}
   lsb.release >= '19.1'
diff --git a/units/camera/manifest.pxu b/units/camera/manifest.pxu
index de12798..ed79336 100644
--- a/units/camera/manifest.pxu
+++ b/units/camera/manifest.pxu
@@ -1,4 +1,9 @@
 unit: manifest entry
 id: has_rpi_camera
 _name: RaspberryPi Camera Module
-value-type: bool
\ No newline at end of file
+value-type: bool
+
+unit: manifest entry
+id: has_camera
+_name: Camera/Capture Device
+value-type: bool