From a7ba4619ab9545bbf48a77ce5aa4a55b48078492 Mon Sep 17 00:00:00 2001 From: Jonathan Cave Date: Fri, 4 Dec 2020 11:07:32 +0000 Subject: watchdog/*: move watchdog tests behind a manifest To allow the watchdog tests to be included in generic test plans they need to be placed behind a manifest entry. Lack of the manifest results in fails on devices without a builtin watchdog (e.g. rpi). --- units/watchdog/jobs.pxu | 4 ++++ units/watchdog/manifest.pxu | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 units/watchdog/manifest.pxu (limited to 'units') diff --git a/units/watchdog/jobs.pxu b/units/watchdog/jobs.pxu index 3247941..f02460f 100644 --- a/units/watchdog/jobs.pxu +++ b/units/watchdog/jobs.pxu @@ -29,6 +29,8 @@ command: {% endif -%} category_id: com.canonical.plainbox::power-management flags: simple +imports: from com.canonical.plainbox import manifest +requires: manifest.has_hardware_watchdog == 'True' id: watchdog/trigger-system-reset depends: watchdog/systemd-config @@ -75,3 +77,5 @@ unit: job plugin: shell command: failed_service_check.sh estimated_duration: 1.0 +imports: from com.canonical.plainbox import manifest +requires: manifest.has_hardware_watchdog == 'True' diff --git a/units/watchdog/manifest.pxu b/units/watchdog/manifest.pxu new file mode 100644 index 0000000..d80d7e1 --- /dev/null +++ b/units/watchdog/manifest.pxu @@ -0,0 +1,5 @@ + +unit: manifest entry +id: has_hardware_watchdog +_name: Hardware Watchdog +value-type: bool -- cgit v1.2.3