2 files changed, 22 insertions, 3 deletions
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index a541e3a..544e7af 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -510,7 +510,9 @@ plugin:shell
 category_id: com.canonical.plainbox::stress
 id: stress/s2idle_pm-graph_30
 estimated_duration: 10m
-requires: executable.name == 'sleepgraph'
+requires: 
+ executable.name == 'sleepgraph'
+ sleep.mem_sleep == 's2idle'
 user: root
 _summary: Resume from idle by using Intel pm-graph
 command:
@@ -520,6 +522,10 @@ plugin: attachment
 category_id: com.canonical.plainbox::stress
 id: stress/s2idle_pm-graph_30.tar.xz
 estimated_duration: 1
+requires: 
+ sleep.mem_sleep == 's2idle'
+after:
+ stress/s2idle_pm-graph_30
 user: root
 _summary: Attach pm-graph logs (s2idle)
 command:
@@ -529,7 +535,9 @@ plugin:shell
 category_id: com.canonical.plainbox::stress
 id: stress/s3_pm-graph_30
 estimated_duration: 10m
-requires: executable.name == 'sleepgraph'
+requires:
+ executable.name == 'sleepgraph'
+ sleep.mem_sleep == 'deep'
 user: root
 _summary: Resume from suspend by using Intel pm-graph
 command:
@@ -539,6 +547,10 @@ plugin: attachment
 category_id: com.canonical.plainbox::stress
 id: stress/s3_pm-graph_30.tar.xz
 estimated_duration: 1
+requires:
+ sleep.mem_sleep == 'deep'
+after:
+ stress/s3_pm-graph_30
 user: root
 _summary: Attach pm-graph logs (s3)
 command:
diff --git a/units/stress/stress-ng.pxu b/units/stress/stress-ng.pxu
index 8dd6853..adca084 100644
--- a/units/stress/stress-ng.pxu
+++ b/units/stress/stress-ng.pxu
@@ -30,4 +30,11 @@ estimated_duration: 1200.0
 environ: STRESS_NG_CLASSES_TIMEOUT
 command:
 cd /var/tmp || exit $?
- stress-ng --sequential 0 --class {stress-ng-class} --timeout "${{STRESS_NG_CLASSES_TIMEOUT:-30}}"
+ stress-ng --sequential 0 --class {stress-ng-class} --timeout "${{STRESS_NG_CLASSES_TIMEOUT:-30}}" --skip-silent --verbose
+ # Error code definition - 3(no resource), 4(not implemented)
+ EXIT_CODE=$?
+ echo "EXIT_CODE="$EXIT_CODE
+ case $EXIT_CODE in
+ 0|3|4) exit 0;;
+ *) exit 1;;
+ esac