diff options
| author | PMR <pmr@pmr-lander> | 2021-02-25 17:37:23 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2021-02-25 17:37:23 +0000 |
| commit | 24b9fa01cf1bb88dcffd561ac2e745ae524763a5 (patch) | |
| tree | 3af11a557faee6a063d943e16ab55657b9510fe6 | |
| parent | 8b8bee607a7d3e698c0bb2e8560fc0c95198c457 (diff) | |
| parent | b2825b18a30db8156dc019c4b995b43b008979a3 (diff) | |
Merge #398647 from ~rodsmith/plainbox-provider-checkbox:add-disk-server-vars
Updated disk_read_performance_test.sh to support increased speed requirements for servers. This MR is to be paired with https://code.launchpad.net/~rodsmith/plainbox-provider-certification-server/+git/plainbox-provider-certification-server/+merge/398646
| -rwxr-xr-x | bin/disk_read_performance_test.sh | 6 | ||||
| -rw-r--r-- | units/disk/jobs.pxu | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/disk_read_performance_test.sh b/bin/disk_read_performance_test.sh index d91dc7b..48f25c0 100755 --- a/bin/disk_read_performance_test.sh +++ b/bin/disk_read_performance_test.sh @@ -5,6 +5,8 @@ #Default to a lower bound of 15 MB/s DEFAULT_BUF_READ=${DISK_READ_PERF:-15} +DEFAULT_NVME_READ=${DISK_NVME_READ_PERF:-200} +DEFAULT_MDADM_READ=${DISK_MDADM_READ_PERF:-80} for disk in "$@"; do @@ -62,9 +64,9 @@ for disk in "$@"; do "ide" ) MIN_BUF_READ=40;; "mmc" ) MIN_BUF_READ=$DEFAULT_BUF_READ;; "mtd" ) MIN_BUF_READ=1;; - "nvme" ) MIN_BUF_READ=200;; + "nvme" ) MIN_BUF_READ=$DEFAULT_NVME_READ;; "nvdimm" ) MIN_BUF_READ=500;; - "mdadm" ) MIN_BUF_READ=80;; + "mdadm" ) MIN_BUF_READ=$DEFAULT_MDADM_READ;; "ata" ) MIN_BUF_READ=80;; "scsi" ) MIN_BUF_READ=100;; "ssd" ) MIN_BUF_READ=200;; diff --git a/units/disk/jobs.pxu b/units/disk/jobs.pxu index 1a0f0d5..a7e3fd3 100644 --- a/units/disk/jobs.pxu +++ b/units/disk/jobs.pxu @@ -61,7 +61,7 @@ requires: _summary: Disk performance test for {product_slug} _description: Verify that disk storage performs at or above baseline performance user: root -environ: DISK_READ_PERF +environ: DISK_READ_PERF DISK_NVME_READ_PERF DISK_MDADM_READ_PERF command: disk_read_performance_test.sh {name} unit: template |