Update cpu jobs to work on snappy

1 files changed, 60 insertions, 23 deletions

diff --git a/jobs/cpu.txt.in b/jobs/cpu.txt.in
index 89de331..aff9574 100644
--- a/jobs/cpu.txt.in
+++ b/jobs/cpu.txt.in
@@ -3,22 +3,28 @@ category_id: 2013.com.canonical.plainbox::cpu
 id: cpu/scaling_test
 estimated_duration: 150.0
 requires:
- package.name == 'fwts'
+ package.name == 'fwts' or executable.name == 'fwts'
 user: root
-environ: PLAINBOX_SESSION_SHARE
+environ: PLAINBOX_SESSION_SHARE LD_LIBRARY_PATH SNAP
 command:
+ if [[ -v SNAP ]]; then
+ export LD_LIBRARY_PATH=$SNAP/usr/lib/fwts:$LD_LIBRARY_PATH
+ fi
 checkbox-support-fwts_test -t cpufreq -l ${PLAINBOX_SESSION_SHARE}/scaling_test.log
 _summary:
- Test CPU frequency scaling
+ Test the CPU scaling capabilities
 _description:
- Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).
+ Use Firmware Test Suite (fwts cpufreq) to test the scaling capabilities of the
+ CPU.
 
 plugin: attachment
 category_id: 2013.com.canonical.plainbox::cpu
 id: cpu/scaling_test-log-attach
 estimated_duration: 1.0
 depends: cpu/scaling_test
-command: [[ -e ${PLAINBOX_SESSION_SHARE}/scaling_test.log ]] && xz -c ${PLAINBOX_SESSION_SHARE}/scaling_test.log | base64
+command: [[ -e ${PLAINBOX_SESSION_SHARE}/scaling_test.log ]] && cat ${PLAINBOX_SESSION_SHARE}/scaling_test.log
+_summary:
+ Attach CPU scaling capabilities log
 _description:
 Attaches the log generated by cpu/scaling_test to the results submission.
 
@@ -27,24 +33,29 @@ category_id: 2013.com.canonical.plainbox::cpu
 id: cpu/maxfreq_test
 estimated_duration: 0.6
 requires:
- package.name == 'fwts'
+ package.name == 'fwts' or executable.name == 'fwts'
 cpuinfo.platform in ("i386", "x86_64", "aarch64")
 user: root
+environ: LD_LIBRARY_PATH SNAP
 command:
+ if [[ -v SNAP ]]; then
+ export LD_LIBRARY_PATH=$SNAP/usr/lib/fwts:$LD_LIBRARY_PATH
+ fi
 checkbox-support-fwts_test -t maxfreq -l $PLAINBOX_SESSION_SHARE/maxfreq_test.log
 _summary:
- Test that CPUs run at max frequency
+ Test that the CPU can run at its max frequency
 _description:
- Test that the CPU can run at its max frequency using Firmware Test Suite (fwts cpufreq).
+ Use the Firmware Test Suite (fwts cpufreq) to ensure that the CPU can run at
+ its maximum frequency.
 
 plugin: attachment
 category_id: 2013.com.canonical.plainbox::cpu
 id: cpu/maxfreq_test-log-attach
 estimated_duration: 1.0
 depends: cpu/maxfreq_test
-command: [ -e $PLAINBOX_SESSION_SHARE/maxfreq_test.log ] && xz -c $PLAINBOX_SESSION_SHARE/maxfreq_test.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/maxfreq_test.log ] && cat $PLAINBOX_SESSION_SHARE/maxfreq_test.log
 _summary:
- Attach log file from cpu/maxfreq_test
+ Attach CPU max frequency log
 _description:
 Attaches the log generated by cpu/maxfreq_test to the results submission.
 
@@ -54,9 +65,9 @@ id: cpu/clocktest
 estimated_duration: 300.0
 command: clocktest
 _summary:
- Test CPUs for clock jitter
+ Tests the CPU for clock jitter
 _description:
- Tests the CPU for clock jitter.
+ Runs a test for clock jitter on SMP machines.
 
 plugin: shell
 category_id: 2013.com.canonical.plainbox::cpu
@@ -65,9 +76,9 @@ estimated_duration: 128.0
 user: root
 command: cpu_offlining
 _summary:
- Test offlining of each CPU Core
+ Test offlining of each CPU core
 _description:
- Test offlining of each CPU core in a multicore system.
+ Attempts to offline each core in a multicore system.
 
 plugin: shell
 category_id: 2013.com.canonical.plainbox::cpu
@@ -76,9 +87,10 @@ estimated_duration: 1.0
 requires: int(cpuinfo.count) > 1 and (cpuinfo.platform == 'i386' or cpuinfo.platform == 'x86_64' or cpuinfo.platform == 's390x')
 command: cpu_topology
 _summary:
- Test CPU topology accuracy between proc and sysfs
+ Check CPU topology for accuracy between proc and sysfs
 _description:
- This test checks cpu topology for accuracy between proc and sysfs.
+ Parses information about CPU topology provided by proc and sysfs and checks
+ that they are consistent.
 
 plugin: shell
 category_id: 2013.com.canonical.plainbox::cpu
@@ -93,21 +105,30 @@ plugin: shell
 category_id: 2013.com.canonical.plainbox::cpu
 id: cpu/arm_vfp_support
 estimated_duration: 1.0
-requires: 'arm' in cpuinfo.type
+requires:
+ cpuinfo.platform in ("armv7l", "aarch64")
+user: root
 command: grep VFP /var/log/syslog
-_description:
+_summary:
 Validate that the Vector Floating Point Unit is running on ARM device
+_description:
+ Validate that the Vector Floating Point Unit is running on ARM device.
 
 plugin:shell
 id: cpu/cstates
 estimated_duration: 10.0
 requires:
- package.name == 'fwts'
+ package.name == 'fwts' or executable.name == 'fwts'
 user: root
+_summary:
+ Run C-States tests
 _description:
- Run Firmware Test Suite (fwts) cstates tests.
-environ: PLAINBOX_SESSION_SHARE
+ Uses the Firmware Test Suite (fwts) to test the power saving states of the CPU.
+environ: PLAINBOX_SESSION_SHARE LD_LIBRARY_PATH SNAP
 command:
+ if [[ -v SNAP ]]; then
+ export LD_LIBRARY_PATH=$SNAP/usr/lib/fwts:$LD_LIBRARY_PATH
+ fi
 checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_cstates_results.log -t cstates
 
 plugin: attachment
@@ -115,8 +136,24 @@ category_id: 2013.com.canonical.plainbox::cpu
 estimated_duration: 0.5
 id: cpu/cstates_results.log
 command:
- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log | base64
-_description: Attaches the FWTS desktop diagnosis results log to the submission
+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log ] && cat ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log
+_summary:
+ Attach C-States test log
+_description:
+ Attaches the FWTS desktop diagnosis results log to the submission.
+
+plugin: shell
+category_id: 2013.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
+_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 -",
+ "depends": "2013.com.canonical.certification::suspend/suspend_advanced_auto"}
+ ]
 
 plugin: shell
 category_id: 2013.com.canonical.plainbox::cpu