diff options
| author | Po-Hsu Lin <po-hsu.lin@canonical.com> | 2015-08-04 17:33:17 +0800 |
|---|---|---|
| committer | Po-Hsu Lin <po-hsu.lin@canonical.com> | 2015-08-04 17:33:17 +0800 |
| commit | 63fa0add690676d4620eb13908e0bab3d3a12a9b (patch) | |
| tree | 09d0417f1f9e425472f8f3126855a77da585f64e | |
| parent | 14fa57140d658f0423c0c67eef2bbac6222ff1cb (diff) | |
provider:checkbox: fix the hybrid sleep attachment bug
Fix the hybrid sleep attachment job by adding a leading GPU index.
| -rw-r--r-- | jobs/suspend.txt.in | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in index 13c92c6..80d8c4e 100644 --- a/jobs/suspend.txt.in +++ b/jobs/suspend.txt.in @@ -337,7 +337,7 @@ command: id: suspend/`echo ${index}`_hybrid_sleep_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'` user: root command: - set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/hybrid_sleep_single -s s3 --s3-hybrid --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 --pm-method=pm-utils | tee $PLAINBOX_SESSION_SHARE/hybrid_sleep_single_times.log + set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single -s s3 --s3-hybrid --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 --pm-method=pm-utils | tee $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single_times.log estimated_duration: 90.0 _description: PURPOSE: @@ -378,12 +378,20 @@ command: Attaches the log from the single suspend/resume test to the results EOF -plugin: shell -id: suspend/hybrid-sleep-single-log-check -estimated_duration: 1.2 -command: [ -e $PLAINBOX_SESSION_SHARE/hybrid_sleep_single.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/hybrid_sleep_single.log -_description: - Automated check of the hybrid sleep log to look for errors reported by fwts +id: suspend/generator_hybrid-sleep-single-log-check +_description: Hybrid sleep log check test +_summary: Hybrid sleep log check test +plugin: local +command: + cat <<'EOF' | run_templates -t -s 'graphics_card_resource' + plugin: shell + id: suspend/`echo ${index}`_hybrid-sleep-single-log-check + depends: suspend/`echo ${index}`_hybrid_sleep_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'` + estimated_duration: 1.2 + command: [ -e $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single.log ] && sleep_test_log_check -v s3 $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single.log + _description: + Automated check of the hybrid sleep log to look for errors reported by fwts + EOF id: suspend/generator_hybrid-sleep-single-log-attach _description: Hybrid sleep log attach |