From 23ca741c1e5f1cf6c2d6de89450071e3a12169d9 Mon Sep 17 00:00:00 2001
From: Rod Smith <rod.smith@canonical.com>
Date: Thu, 6 Feb 2020 10:56:14 -0500
Subject: Replace three stress-ng scripts with a unified script.

---
 units/disk/jobs.pxu   | 4 ++--
 units/memory/jobs.pxu | 2 +-
 units/stress/jobs.pxu | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'units')

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..f84fd3d 100644
--- a/units/memory/jobs.pxu
+++ b/units/memory/jobs.pxu
@@ -46,7 +46,7 @@ estimated_duration: 11000.0
 user: root
 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)
-- 
cgit v1.2.3


From 7f54a248b998a84b58cf26f4e53652766ff10f71 Mon Sep 17 00:00:00 2001
From: Rod Smith <rod.smith@canonical.com>
Date: Mon, 24 Feb 2020 13:03:53 -0500
Subject: Added explicit 'environ' specification to memory stress test
 definition

---
 units/memory/jobs.pxu | 1 +
 1 file changed, 1 insertion(+)

(limited to 'units')

diff --git a/units/memory/jobs.pxu b/units/memory/jobs.pxu
index f84fd3d..5fad4f4 100644
--- a/units/memory/jobs.pxu
+++ b/units/memory/jobs.pxu
@@ -44,6 +44,7 @@ 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: stress_ng_test memory
-- 
cgit v1.2.3