diff options
| author | PMR <pmr@pmr-lander> | 2020-02-25 16:35:50 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2020-02-25 16:35:50 +0000 |
| commit | 0c06eadd115b2cf015b8edcb756fe9236c151753 (patch) | |
| tree | 991c7b64a43a8803434358237fa40ca4f09d80c8 /units | |
| parent | b5986748a745f0c41231739d82e31b5fea03b885 (diff) | |
| parent | 7f54a248b998a84b58cf26f4e53652766ff10f71 (diff) | |
Merge #379215 from ~rodsmith/plainbox-provider-checkbox:unify-stress-ng-wrapper-scripts-2
Replace three stress-ng wrapper scripts with one unified script.
Diffstat (limited to 'units')
| -rw-r--r-- | units/disk/jobs.pxu | 4 | ||||
| -rw-r--r-- | units/memory/jobs.pxu | 3 | ||||
| -rw-r--r-- | units/stress/jobs.pxu | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/units/disk/jobs.pxu b/units/disk/jobs.pxu index 3e0f568..431cb2e 100644 --- a/units/disk/jobs.pxu +++ b/units/disk/jobs.pxu @@ -94,10 +94,10 @@ command: if [ -n "$STRESS_NG_DISK_TIME" ] then echo "Found STRESS_NG_DISK_TIME env var, stress_ng disk running time is now: $STRESS_NG_DISK_TIME seconds" - disk_stress_ng {name} --base-time $STRESS_NG_DISK_TIME --really-run + stress_ng_test disk --device {name} --base-time $STRESS_NG_DISK_TIME else echo "STRESS_NG_DISK_TIME env var is not found, stress_ng disk running time is default value" - disk_stress_ng {name} --base-time 240 --really-run + stress_ng_test disk --device {name} --base-time 240 fi unit: template diff --git a/units/memory/jobs.pxu b/units/memory/jobs.pxu index 48d543c..5fad4f4 100644 --- a/units/memory/jobs.pxu +++ b/units/memory/jobs.pxu @@ -44,9 +44,10 @@ category_id: com.canonical.plainbox::memory id: memory/memory_stress_ng estimated_duration: 11000.0 user: root +environ: STRESS_NG_MIN_SWAP_SIZE requires: package.name == 'stress-ng' or executable.name == 'stress-ng' -command: memory_stress_ng +command: stress_ng_test memory _summary: Stress test of system memory _description: Test to perform some basic stress and exercise of system memory via the diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu index cf44c6c..0a1ce27 100644 --- a/units/stress/jobs.pxu +++ b/units/stress/jobs.pxu @@ -22,10 +22,10 @@ command: if [ -n "$STRESS_NG_CPU_TIME" ] then echo "Found STRESS_NG_CPU_TIME env var, stress_ng cpu running time is now: $STRESS_NG_CPU_TIME seconds" - cpu_stress --runtime $STRESS_NG_CPU_TIME + stress_ng_test cpu --base-time $STRESS_NG_CPU_TIME else echo STRESS_NG_CPU_TIME env var is not found, stress_ng cpu running time is default value - cpu_stress --runtime 7200 + stress_ng_test cpu --base-time 7200 fi _summary: Stress of CPUs (very long runtime) |