Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve job definition layout and contents in a handful of dirs in the base providers (BugFix) #1088

Closed
wants to merge 13 commits into from
4 changes: 2 additions & 2 deletions providers/base/units/6lowpan/jobs.pxu
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ command:
grep -E "$config=(y|m)" /boot/config-"$(uname -r)" || exit 1
done
_summary: kernel config options for 6LoWPAN
_description:
Checks the kernel config options for 6LoWPAN / IEEE802.15.4 support
_purpose: Checks the kernel config options for 6LoWPAN / IEEE802.15.4 support

6 changes: 3 additions & 3 deletions providers/base/units/acpi/jobs.pxu
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
id: acpi/oem_osi
_summary: test ACPI OEM _OSI strings
_description:
This checks if the depreciated OEM _OSI strings are still used by checking the ACPI DSDT and SSDT tables
_summary: Test ACPI OEM _OSI strings
_purpose:
This checks if the deprecated OEM _OSI strings are still used by checking the ACPI DSDT and SSDT tables
plugin: shell
category_id: acpi
requires:
Expand Down
57 changes: 29 additions & 28 deletions providers/base/units/benchmarks/jobs.pxu
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ estimated_duration: 15.0
user: root
command: hdparm -t /dev/{name}
_summary: Raw read timing benchmark of {name} using hdparm
_description: This test runs hdparm timing of device reads as a benchmark for {name}
_purpose: This test runs hdparm timing of device reads as a benchmark for {name}

unit: template
template-resource: device
Expand All @@ -22,7 +22,7 @@ estimated_duration: 10.0
user: root
command: hdparm -T /dev/{name}
_summary: Cached read timing benchmark of {name} using hdparm
_description: This test runs hdparm timing of cache reads as a benchmark for {name}
_purpose: This test runs hdparm timing of cache reads as a benchmark for {name}

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -31,16 +31,17 @@ depends: graphics/xorg-version
requires: package.name == 'gtkperf'
command: python3 -c 'import re,sys,subprocess; (s, o) = subprocess.getstatusoutput("gtkperf -a"); [sys.exit(1) for i in [s] if s]; m = re.search("Total time:\s+(.*)\n", o); [print(i.group(1)+" Seconds") for i in [m] if m]'
estimated_duration: 30.000
_description:
Run gtkperf to make sure that GTK based test cases work
_purpose: Run gtkperf to make sure that GTK based test cases work
_summary: Ensures that GTK based test cases are operational by running gtkperf.
Comment on lines +34 to +35
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary should be shorter than the _purpose:

Suggested change
_purpose: Run gtkperf to make sure that GTK based test cases work
_summary: Ensures that GTK based test cases are operational by running gtkperf.
_purpose: Ensures that GTK based test cases are operational by running gtkperf.
_summary: Run gtkperf on all GTK based test cases


plugin: shell
category_id: com.canonical.plainbox::benchmarks
id: benchmarks/graphics/render-bench
requires: package.name == 'render-bench'
command: /usr/bin/time -f "%e Seconds" render_bench > /dev/null 2>&1
estimated_duration: 52.000
_description: Run Render-Bench XRender/Imlib2 benchmark
_summary: Run Render-Bench XRender/Imlib2 benchmark
_purpose: Execute the Render-Bench XRender/Imlib2 benchmark to assess graphics performance.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -50,7 +51,8 @@ requires:
'arm' in cpuinfo.type
command:
glmark2-es2 2>&1 | sed -e :a -e '$!N;s/\n/ /;ta' | sed -E 's/.*(Score:\s+[0-9]+).*/\1/'
_description: Run GLmark2-ES2 benchmark
_purpose: Run GLmark2-ES2 benchmark
_summary: Execute the GLmark2-ES2 benchmark on ARM devices.
Comment on lines +54 to +55
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_purpose: Run GLmark2-ES2 benchmark
_summary: Execute the GLmark2-ES2 benchmark on ARM devices.
_purpose: Run GLmark2-ES2 benchmark (for ARM devices).
_summary: Execute the GLmark2-ES2 benchmark.


plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -61,30 +63,34 @@ requires:
command:
glmark2 2>&1 | sed -e :a -e '$!N;s/\n/ /;ta' | sed -E 's/.*(Score:\s+[0-9]+).*/\1/'
estimated_duration: 306.000
_description: Run GLmark2 benchmark
_purpose: Run GLmark2 benchmark
_summary: Execute GLmark2 benchmark and extract score.
Comment on lines +66 to +67
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_purpose: Run GLmark2 benchmark
_summary: Execute GLmark2 benchmark and extract score.
_purpose: Run GLmark2 benchmark (for x86/amd64 devices)
_summary: Execute GLmark2 benchmark.


plugin: shell
category_id: com.canonical.plainbox::benchmarks
id: benchmarks/network/wifi_time_to_reconnect
requires: device.category == 'WIRELESS'
command: wifi_time2reconnect.py
_description: Check the time needed to reconnect to a WIFI access point
_purpose: Check the time needed to reconnect to a WIFI access point
_summary: Measure WIFI reconnection time.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
id: benchmarks/system/cpu_on_idle
estimated_duration: 10.0
requires: package.name == 'sysstat'
command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("idle\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
_description: CPU utilization on an idle system.
_purpose: CPU utilization on an idle system.
_summary: Measure CPU utilization on an idle system.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
id: benchmarks/system/disk_on_idle
estimated_duration: 10.0
requires: package.name == 'sysstat'
command: iostat -x -m 1 10 | python3 -c 'import sys, re; lines="".join(sys.stdin.readlines()); l=[float(n) for n in (re.findall("util\n.*?(\S+)\n", lines))]; print(sum(l)/len(l),"%")'
_description: Disk utilization on an idle system.
_purpose: Disk utilization on an idle system.
_summary: Measure disk utilization on an idle system.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -94,9 +100,8 @@ requires:
cpuinfo.platform == 'x86_64'
command: gputest_benchmark.py fur --width 1920 --height 1080 -f
estimated_duration: 75.000
_description:
Run a stress test based on FurMark (OpenGL 2.1 or 3.2)
Fullscreen 1920x1080 no antialiasing
_purpose: Run a stress test based on FurMark (OpenGL 2.1 or 3.2)in Fullscreen 1920x1080 no antialiasing
_summary: Conduct a FurMark stress test in fullscreen 1920x1080 without antialiasing.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -106,9 +111,8 @@ requires:
cpuinfo.platform == 'x86_64'
command: gputest_benchmark.py fur
estimated_duration: 75.000
_description:
Run a stress test based on FurMark (OpenGL 2.1 or 3.2)
Windowed 1024x640 no antialiasing
_purpose: Run a stress test based on FurMark (OpenGL 2.1 or 3.2) Windowed 1024x640 no antialiasing
_summary: Conduct a FurMark-based OpenGL stress test at 1024x640 without antialiasing.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -118,9 +122,8 @@ requires:
cpuinfo.platform == 'x86_64'
command: gputest_benchmark.py gi --width 1920 --height 1080 -f
estimated_duration: 75.00
_description:
Run GiMark, a geometry instancing test (OpenGL 3.3)
Fullscreen 1920x1080 no antialiasing
_purpose: Run GiMark, a geometry instancing test (OpenGL 3.3) Fullscreen 1920x1080 no antialiasing
_summary: Run GiMark OpenGL 3.3 benchmark at 1920x1080 fullscreen without antialiasing.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -130,9 +133,9 @@ requires:
cpuinfo.platform == 'x86_64'
command: gputest_benchmark.py gi
estimated_duration: 75.500
_description:
Run GiMark, a geometry instancing test (OpenGL 3.3)
Windowed 1024x640 no antialiasing
_purpose:
Run GiMark, a geometry instancing test (OpenGL 3.3) in a windowed 1024x640 resolution without antialiasing.
_summary: Run GiMark OpenGL 3.3 geometry test at 1024x640 windowed without antialiasing.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -142,9 +145,8 @@ requires:
cpuinfo.platform == 'x86_64'
command: gputest_benchmark.py tess --width 1920 --height 1080 -f
estimated_duration: 75.000
_description:
Run a tessellation test based on TessMark (OpenGL 4.0)
Fullscreen 1920x1080 no antialiasing
_purpose: Run a tessellation test based on TessMark (OpenGL 4.0), fullscreen 1920x1080 with no antialiasing.
_summary: Run TessMark tessellation test at 1920x1080 fullscreen without antialiasing.

plugin: shell
category_id: com.canonical.plainbox::benchmarks
Expand All @@ -153,6 +155,5 @@ requires:
package.name == 'gputest'
cpuinfo.platform == 'x86_64'
command: gputest_benchmark.py tess
_description:
Run a tessellation test based on TessMark (OpenGL 4.0)
Windowed 1024x640 no antialiasing
_purpose: Run a tessellation test based on TessMark (OpenGL 4.0) Windowed 1024x640 no antialiasing
_summary: Run TessMark tessellation test at 1024x640 windowed without antialiasing.
Loading