Merge ~kissiel/plainbox-provider-checkbox:zapper-resource-job into plainbox-provider-checkbox:master

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 2922ab5b33407688cc4e8ef435c9d67f9933085a
Merged at revision: d693981bfa27560b2e7878858024eea11ee9945b
Proposed branch: ~kissiel/plainbox-provider-checkbox:zapper-resource-job
Merge into: plainbox-provider-checkbox:master
Diff against target: 30 lines (+9/-6)
2 files modified
units/zapper/resource.pxu (+7/-4)
units/zapper/test-plan.pxu (+2/-2)
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+421206@code.launchpad.net

Description of the change

This patch adds a Zapper resource job that informs checkbox what the Zapper installation can perform.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

The end of the pig... :)
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/zapper/resource.pxu b/units/zapper/resource.pxu
2index 81b9d19..fcfe8a8 100644
3--- a/units/zapper/resource.pxu
4+++ b/units/zapper/resource.pxu
5@@ -1,5 +1,8 @@
6-id: pig
7+id: zapper_capabilities
8 plugin: resource
9-_summary: Get Pig's capabilities
10-environ: PIG_HOST
11-command: ssh -q -o 'StrictHostKeyChecking=no' "$PIG_HOST" /snap/bin/pigbox capabilities
12+_summary: Get Zapper's setup capabilities
13+_description:
14+ Connect to Zapper and list functions that the current setup (DUT + Zapper) are
15+ capable off.
16+environ: ZAPPER_HOST
17+command: checkbox-support-zapper-proxy get_capabilities
18diff --git a/units/zapper/test-plan.pxu b/units/zapper/test-plan.pxu
19index ce287ff..db7ded7 100644
20--- a/units/zapper/test-plan.pxu
21+++ b/units/zapper/test-plan.pxu
22@@ -11,6 +11,6 @@ unit: test plan
23 _name: Tests using Zapper
24 _description: Tests using Zapper
25 include:
26- monitor/pig-edid
27+ monitor/zapper-edid
28 bootstrap_include:
29- pig
30+ zapper_capabilities

Subscribers

People subscribed via source and target branches