Merge ~jocave/plainbox-provider-checkbox:watchdog-detect into plainbox-provider-checkbox:master

Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: 15b1549411dbcac3eb6bc11c8e3d16c0e6d1b417
Merged at revision: 5054743bec999f7030a42a9fa6dc164792369958
Proposed branch: ~jocave/plainbox-provider-checkbox:watchdog-detect
Merge into: plainbox-provider-checkbox:master
Diff against target: 28 lines (+9/-0)
2 files modified
units/watchdog/jobs.pxu (+8/-0)
units/watchdog/test-plan.pxu (+1/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+395447@code.launchpad.net

Description of the change

Add a watchdog detect job. Simple udev_resource based detection.

Tested on caracalla. Depends on:
https://code.launchpad.net/~jocave/plainbox-provider-resource/+git/plainbox-provider-resource/+merge/395445

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/watchdog/jobs.pxu b/units/watchdog/jobs.pxu
2index f02460f..0e16f82 100644
3--- a/units/watchdog/jobs.pxu
4+++ b/units/watchdog/jobs.pxu
5@@ -1,3 +1,11 @@
6+id: watchdog/detect
7+category_id: com.canonical.plainbox::power-management
8+_summary: Detect presence of a Hardware Watchdog
9+flags: simple
10+imports: from com.canonical.plainbox import manifest
11+requires: manifest.has_hardware_watchdog == 'True'
12+command: udev_resource.py -f WATCHDOG
13+
14 id: watchdog/systemd-config
15 _summary: Check if the hardware watchdog is properly configured
16 template-engine: jinja2
17diff --git a/units/watchdog/test-plan.pxu b/units/watchdog/test-plan.pxu
18index 6de8e71..01057d0 100644
19--- a/units/watchdog/test-plan.pxu
20+++ b/units/watchdog/test-plan.pxu
21@@ -23,6 +23,7 @@ _description:
22 QA test plan that includes automated watchdog tests
23 estimated_duration: 1s
24 include:
25+ watchdog/detect
26 watchdog/systemd-config
27 watchdog/trigger-system-reset-auto
28 watchdog/post-trigger-system-reset-auto

Subscribers

People subscribed via source and target branches