Merge ~pgentili/plainbox-provider-checkbox:zapper-usb2 into plainbox-provider-checkbox:master

[Paolo Gentili]

Add: usb2.0 version of insertion/removal zapper tests

https://warthogs.atlassian.net/browse/ZAP-206

[Maciej Kisielewski (kissiel)]

Looks good!
+1

review: Approve

diff --git a/units/zapper/jobs.pxu b/units/zapper/jobs.pxu
index ee2e767..2767122 100644
--- a/units/zapper/jobs.pxu
+++ b/units/zapper/jobs.pxu
@@ -8,11 +8,30 @@ command: edid_cycle.py "$ZAPPER_HOST"
 
 unit: template
 template-resource: zapper_capabilities
+template-filter: zapper_capabilities.capability == 'USB hotplug'
+category_id: com.canonical.plainbox::usb
+id: usb/zapper-usb-insert-{{ port_alias }}
+template-engine: jinja2
+_summary: Zapper-driven USB insertion test on port {{ port_alias }}
+requires: usb.usb2 == 'supported'
+plugin: shell
+user: root
+environ: ZAPPER_HOST
+command:
+ {%- if __on_ubuntucore__ %}
+     checkbox-support-run_watcher --zapper-usb-address={{ port_alias }} insertion usb2
+ {%- else %}
+     removable_storage_watcher.py --unmounted --zapper-usb-address={{ port_alias }} insert usb
+ {% endif -%}
+estimated_duration: 20
+
+unit: template
+template-resource: zapper_capabilities
 template-filter: zapper_capabilities.capability == 'USB hotplug' and zapper_capabilities.usb_version == '3'
 category_id: com.canonical.plainbox::usb
 id: usb3/zapper-usb-insert-{{ port_alias }}
 template-engine: jinja2
-_summary: Zapper-driven USB insertion test on port {{ port_alias }}
+_summary: Zapper-driven USB 3.0 insertion test on port {{ port_alias }}
 requires: usb.usb3 == 'supported'
 plugin: shell
 user: root
@@ -27,11 +46,30 @@ estimated_duration: 20
 
 unit: template
 template-resource: zapper_capabilities
+template-filter: zapper_capabilities.capability == 'USB hotplug'
+category_id: com.canonical.plainbox::usb
+id: usb/zapper-usb-remove-{{ port_alias }}
+template-engine: jinja2
+_summary: Zapper-driven USB removal test on port {{ port_alias }}
+requires: usb.usb2 == 'supported'
+plugin: shell
+user: root
+environ: ZAPPER_HOST
+command:
+ {%- if __on_ubuntucore__ %}
+     checkbox-support-run_watcher --zapper-usb-address={{ port_alias }} removal usb2
+ {%- else %}
+     removable_storage_watcher.py --unmounted --zapper-usb-address={{ port_alias }} remove usb
+ {% endif -%}
+estimated_duration: 20
+
+unit: template
+template-resource: zapper_capabilities
 template-filter: zapper_capabilities.capability == 'USB hotplug' and zapper_capabilities.usb_version == '3'
 category_id: com.canonical.plainbox::usb
 id: usb3/zapper-usb-remove-{{ port_alias }}
 template-engine: jinja2
-_summary: Zapper-driven USB removal test on port {{ port_alias }}
+_summary: Zapper-driven USB 3.0 removal test on port {{ port_alias }}
 requires: usb.usb3 == 'supported'
 plugin: shell
 user: root
diff --git a/units/zapper/test-plan.pxu b/units/zapper/test-plan.pxu
index 889fb50..8919a7f 100644
--- a/units/zapper/test-plan.pxu
+++ b/units/zapper/test-plan.pxu
@@ -12,6 +12,8 @@ _name: Tests using Zapper
 _description: Tests using Zapper
 include:
   monitor/zapper-edid
+  usb/zapper-usb-insert-.*
+  usb/zapper-usb-remove-.*
   usb3/zapper-usb-insert-.*
   usb3/zapper-usb-remove-.*
 bootstrap_include: