summaryrefslogtreecommitdiff
diff options
authorMaciej Kisielewski <maciej.kisielewski@canonical.com>2018-06-21 17:13:33 +0200
committerMaciej Kisielewski <maciej.kisielewski@canonical.com>2018-06-21 17:13:33 +0200
commit4802642171777b8858c9aa75b3c52c07050131ef (patch)
tree96420c6474ae923de2e5fe982467c500cd033cab
parent29d386b3125c7ed054bd5297b0a756b7c62f2c5e (diff)
pm_test: make jobs that use pm_test dry-run aware
Signed-off-by: Maciej Kisielewski <maciej.kisielewski@canonical.com>
-rw-r--r--units/power-management/jobs.pxu4
-rw-r--r--units/stress/jobs.pxu9
2 files changed, 7 insertions, 6 deletions
diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu
index be640c3..9f8f62e 100644
--- a/units/power-management/jobs.pxu
+++ b/units/power-management/jobs.pxu
@@ -36,7 +36,7 @@ id: power-management/poweroff
estimated_duration: 120.0
depends: power-management/fwts_wakealarm
user: root
-environ: PLAINBOX_SESSION_SHARE
+environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
requires: executable.name == 'fwts'
command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn
@@ -58,7 +58,7 @@ category_id: com.canonical.plainbox::power-management
id: power-management/reboot
estimated_duration: 120.0
user: root
-environ: PLAINBOX_SESSION_SHARE
+environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
requires: executable.name == 'fwts'
command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index 8d25af9..e0c2e0a 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -76,6 +76,7 @@ requires:
executable.name == 'x-terminal-emulator'
flags: noreturn
user: root
+environ: PM_TEST_DRY_RUN
command:
pm_test reboot --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent
_description:
@@ -226,7 +227,7 @@ requires: executable.name == 'fwts'
command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn
user: root
-environ: PLAINBOX_SESSION_SHARE
+environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
_description:
Stress reboot system (100 cycles)
@@ -248,7 +249,7 @@ command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkb
flags: noreturn
estimated_duration: 2700
user: root
-environ: PLAINBOX_SESSION_SHARE
+environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
_description:
Stress reboot system (30 cycles)
@@ -270,7 +271,7 @@ requires:
command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn
user: root
-environ: PLAINBOX_SESSION_SHARE
+environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
_description:
Stress poweroff system (100 cycles)
@@ -293,7 +294,7 @@ command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkb
flags: noreturn
estimated_duration: 3600
user: root
-environ: PLAINBOX_SESSION_SHARE
+environ: PLAINBOX_SESSION_SHARE PM_TEST_DRY_RUN
_description:
Stress poweroff system (30 cycles)