diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2020-07-14 14:49:51 +0200 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2020-07-14 14:49:51 +0200 |
| commit | 0cd78674904b3a27cc18682095a0f51446cded90 (patch) | |
| tree | 64d258e782e34d9955901cf39079228b5cfe57e1 /units | |
| parent | 0ae5b46e8d86811d07200998bf78186970a27a98 (diff) | |
p-p-r:bin:cpuinfo_resource -> cpuinfo_resource.py
Diffstat (limited to 'units')
| -rw-r--r-- | units/cpu/jobs.pxu | 4 | ||||
| -rw-r--r-- | units/stress/jobs.pxu | 2 | ||||
| -rw-r--r-- | units/suspend/suspend.pxu | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu index 94c2277..2953d16 100644 --- a/units/cpu/jobs.pxu +++ b/units/cpu/jobs.pxu @@ -170,10 +170,10 @@ category_id: com.canonical.plainbox::cpu id: cpu/cpuinfo_before_suspend estimated_duration: 1.2 _summary: Verify that all the CPUs are online before suspending -command: cpuinfo_resource > $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend +command: cpuinfo_resource.py > $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend _siblings: [ { "id": "after-suspend-cpu/cpuinfo_after_suspend", "_summary": "Verify that all the CPUs are online after suspending", - "command": "cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -", + "command": "cpuinfo_resource.py | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -", "depends": "com.canonical.certification::suspend/suspend_advanced_auto"} ] diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu index 302fae3..37c9472 100644 --- a/units/stress/jobs.pxu +++ b/units/stress/jobs.pxu @@ -5,7 +5,7 @@ estimated_duration: 7200.0 requires: package.name == 'stress' user: root -command: num_vm=$(awk '/MemTotal/ {x=$2/262144; print ((x == int(x)) ? x : int(x) +1)}' /proc/meminfo); vm_bytes=$(($(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)/$num_vm/4))M; stress --cpu `cpuinfo_resource | awk '/count:/ {print $2}'` --vm $num_vm --vm-bytes $vm_bytes --timeout 7200s +command: num_vm=$(awk '/MemTotal/ {x=$2/262144; print ((x == int(x)) ? x : int(x) +1)}' /proc/meminfo); vm_bytes=$(($(awk '/MemTotal/ {print int($2/1024)}' /proc/meminfo)/$num_vm/4))M; stress --cpu `cpuinfo_resource.py | awk '/count:/ {print $2}'` --vm $num_vm --vm-bytes $vm_bytes --timeout 7200s _description: Simulate high system load using the 'stress' tool to exercise the CPU for several hours. The test is considered passed if the system does not freeze or diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index 44790da..c111dce 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -39,7 +39,7 @@ category_id: com.canonical.plainbox::suspend id: suspend/cpu_before_suspend estimated_duration: 1.2 _summary: Verify that all the CPUs are online before suspending -command: cpuinfo_resource > $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend +command: cpuinfo_resource.py > $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend plugin: shell category_id: com.canonical.plainbox::suspend @@ -558,7 +558,7 @@ id: suspend/cpu_after_suspend estimated_duration: 1.2 depends: suspend/suspend_advanced suspend/cpu_before_suspend _description: Verify that all CPUs are online after resuming. -command: cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend - +command: cpuinfo_resource.py | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend - plugin: shell category_id: com.canonical.plainbox::suspend @@ -566,7 +566,7 @@ id: suspend/cpu_after_suspend_auto estimated_duration: 1.2 depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend _description: Verify that all CPUs are online after resuming. -command: cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend - +command: cpuinfo_resource.py | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend - plugin: shell category_id: com.canonical.plainbox::suspend |