From 05fb825b198753b240b4f37309bcdbca6ce984d0 Mon Sep 17 00:00:00 2001 From: Rod Smith Date: Thu, 11 Jun 2020 11:41:43 -0400 Subject: Added new fstrim test Delete redundant disk_support.py --- units/disk/jobs.pxu | 14 ++++++++++++++ units/disk/test-plan.pxu | 2 ++ 2 files changed, 16 insertions(+) (limited to 'units') diff --git a/units/disk/jobs.pxu b/units/disk/jobs.pxu index 431cb2e..caafbad 100644 --- a/units/disk/jobs.pxu +++ b/units/disk/jobs.pxu @@ -77,6 +77,20 @@ _summary: Disk I/O stress test for {product_slug} _description: Take the path of the storage device and test is it a block device command: storage_test.py {name} +unit: template +template-resource: device +template-filter: device.category == 'DISK' +plugin: shell +category_id: com.canonical.plainbox::disk +id: disk/fstrim_{name} +estimated_duration: 1.0 +user: root +requires: + block_device.rotation == 'no' and block_device.name == '{name}' +_summary: Filesystem TRIM check for {product_slug} +_description: Take the path of the storage device and test its TRIM capabilities +command: fstrim_test --device-file {name} + unit: template template-resource: device template-filter: device.category == 'DISK' diff --git a/units/disk/test-plan.pxu b/units/disk/test-plan.pxu index 3c59a64..3f2220e 100644 --- a/units/disk/test-plan.pxu +++ b/units/disk/test-plan.pxu @@ -15,6 +15,7 @@ include: disk/stats_.* disk/read_performance_.* certification-status=blocker disk/storage_device_.* certification-status=blocker + disk/fstrim_.* certification-status=non-blocker benchmarks/disk/hdparm-read_.* benchmarks/disk/hdparm-cache-read_.* disk/apste_support_on_.* @@ -52,5 +53,6 @@ include: disk/stats_.* disk/read_performance_.* disk/storage_device_.* + disk/fstrim_.* certification-status=non-blocker bootstrap_include: device -- cgit v1.2.3