Make it not always using the local job generated test case

3 files changed, 61 insertions, 4 deletions

diff --git a/jobs/hibernate.txt.in b/jobs/hibernate.txt.in
index a9ab661..7fde5ef 100644
--- a/jobs/hibernate.txt.in
+++ b/jobs/hibernate.txt.in
@@ -1,3 +1,30 @@
+plugin: user-interact-verify
+id: power-management/hibernate_advanced
+requires:
+ sleep.disk == 'supported'
+ rtc.state == 'supported'
+environ: PLAINBOX_SESSION_SHARE
+user: root
+command:
+ if type -P fwts >/dev/null; then
+ echo "Calling fwts"
+ fwts_test -l $PLAINBOX_SESSION_SHARE/hibernate-single -f none -s s4 --s4-device-check --s4-device-check-delay=45 --s4-sleep-delay=120
+ else
+ echo "Calling sleep_test"
+ sleep_test -s disk -w 120
+ fi
+estimated_duration: 300.00
+_description:
+ PURPOSE:
+ This test will check to make sure your system can successfully hibernate (if supported)
+ STEPS:
+ 1. Click on Test
+ 2. The system will hibernate and should wake itself within 5 minutes
+ 3. If your system does not wake itself after 5 minutes, please press the power button to wake the system manually
+ 4. If the system fails to resume from hibernate, please restart System Testing and mark this test as Failed
+ VERIFICATION:
+ Did the system successfully hibernate and did it work properly after waking up?
+
 id: power-management/generator_hibernate_advanced
 requires:
 sleep.disk == 'supported'
@@ -38,6 +65,13 @@ command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && sleep_test_log_c
 _description:
 Automated check of the hibernate log for errors discovered by fwts
 
+plugin: attachment
+id: power-management/hibernate-single-log-attach
+depends: power-management/hibernate_advanced
+command: [ -e $PLAINBOX_SESSION_SHARE/hibernate-single.log ] && cat $PLAINBOX_SESSION_SHARE/hibernate-single.log
+estimated_duration: 0.5
+_description: attaches log from single hibernate/resume test to results
+
 id: power-management/generator_hibernate-single-log-attach
 _description: Hibernate log attach
 _summary: Hibernate log attach
diff --git a/jobs/stress.txt.in b/jobs/stress.txt.in
index 565a91a..bc64dd2 100644
--- a/jobs/stress.txt.in
+++ b/jobs/stress.txt.in
@@ -13,7 +13,7 @@ plugin: shell
 id: power-management/hibernate_30_cycles
 estimated_duration: 5400.00
 depends:
- power-management/1_hibernate_advanced_.*
+ power-management/hibernate_advanced
 requires:
 sleep.disk == 'supported'
 rtc.state == 'supported'
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 307cc40..ec46267 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -258,7 +258,7 @@ environ: PLAINBOX_SESSION_SHARE
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/2_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/2_suspend_single_times.log
+ set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/1_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/1_suspend_single_times.log
 else
 echo "Calling sleep_test"
 set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/2_suspend_single_times.log
@@ -358,6 +358,13 @@ command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && sleep_test_log_che
 _description:
 Automated check of the suspend log to look for errors reported by fwts
 
+plugin: attachment
+id: suspend/suspend-single-log-attach
+depends: suspend/suspend_advanced
+command: [ -e $PLAINBOX_SESSION_SHARE/1_suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/1_suspend_single.log
+_description:
+ Attaches the log from the single suspend/resume test to the results
+
 id: suspend/generator_suspend-single-log-attach
 _description: Suspend log attach
 _summary: Suspend log attach
@@ -366,6 +373,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
 plugin: attachment
 id: suspend/`echo ${index}`_suspend-single-log-attach_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
 command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
@@ -392,6 +400,13 @@ command:
 Attaches the log from the single hybrid sleep/resume test to the results
 EOF
 
+plugin: shell
+id: suspend/suspend-time-check
+estimated_duration: 1.2
+command: [ -e $PLAINBOX_SESSION_SHARE/1_suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/1_suspend_single_times.log
+_description:
+ Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
+
 id: suspend/generator_suspend-time-check
 _description: Suspend time check test
 _summary: Suspend time check test
@@ -400,6 +415,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
 plugin: shell
 id: suspend/`echo ${index}`_suspend-time-check_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
 estimated_duration: 1.2
 command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/`echo ${index}`_suspend_single_times.log
 _description: Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
@@ -460,7 +476,7 @@ command:
 plugin: shell
 id: suspend/`echo ${index}`_resolution_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
 estimated_duration: 1.2
- depends: suspend/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'` suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
 _description: Test to see that we have the same resolution after resuming as before.
 command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/`echo ${index}`_resolution_before_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`.txt -
 EOF
@@ -540,7 +556,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
 plugin: manual
 id: suspend/`echo ${index}`_display_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
- depends: suspend/suspend_advanced
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
 _summary: Test display function after suspend for $product
 _description:
 PURPOSE:
@@ -1371,6 +1387,7 @@ command:
 cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
 plugin: user-interact-verify
 id: suspend/`echo ${index}`_cycle_resolutions_after_suspend_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: suspend/`echo ${index}`_suspend_after_switch_to_card_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
 estimated_duration: 120.0
 requires: package.name == 'xorg'
 depends: suspend/suspend_advanced
@@ -1394,6 +1411,12 @@ _description:
 This is done automatically by taking screenshots and uploading them as an attachment.
 command: xrandr_cycle --keyword=after_suspend --screenshot-dir $PLAINBOX_SESSION_SHARE
 
+plugin: attachment
+id: suspend/xrandr_screens_after_suspend.tar.gz
+depends: suspend/cycle_resolutions_after_suspend
+command: [ -e $PLAINBOX_SESSION_SHARE/1_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/1_xrandr_screens_after_suspend.tgz
+_description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
+
 plugin: local
 id: suspend/generator_xrandr_screens_after_suspend.tar.gz
 _description: Attach screenshots from the suspend/cycle_resolution_after_suspend test to the results submission.