Merge lp:~roadmr/checkbox/graphics_card_resource into lp:checkbox

[Daniel Manrique]

Adds a graphics_card_resource to enumerate graphics cards, converts a few jobs to use the resource to test multi-GPU systems.

Adds a graphics_card_resource to enumerate graphics cards, converts a few jobs to use the resource to test multi-GPU systems.

Generated job names look like:

graphics/1_maximum_resolution_Haswell-ULT_Integrated_Graphics_Controller

Jobs generated have the card index at the beginning, so for a given card you can add this to the whitelist to ensure all its tests run first:

graphics/1_.*

Or if you want all cards to test resolution, something like this works:

graphics/\d_resolution_change.*

Using the first syntax, we can ensure that per-card tests are clustered together, so that they can be run for card 1, then enabling card 2 and testing that:

graphics/1_.*
graphics/2_.*

I converted a few sample jobs to illustrate this mechanism and hopefully get the underlying code merged, but we'll probably need another MR to convert all the jobs we actually want to run per-card to this format, as well as updating the whitelists.

[Zygmunt Krynicki (zyga)]

Looks good to me, +1

review: Approve

=== modified file 'plainbox-provider-certification-client/provider_whitelists/client-cert.whitelist'
--- plainbox-provider-certification-client/provider_whitelists/client-cert.whitelist	2014-04-08 10:16:22 +0000
+++ plainbox-provider-certification-client/provider_whitelists/client-cert.whitelist	2014-04-08 20:07:34 +0000
@@ -85,6 +85,7 @@
 graphics/display
 graphics/minimum_resolution
 graphics/maximum_resolution
+graphics/\d_maximum_resolution.*
 graphics/xorg-failsafe
 graphics/xorg-process
 graphics/cycle_resolution

=== modified file 'plainbox-provider-certification-client/provider_whitelists/client-selftest.whitelist'
--- plainbox-provider-certification-client/provider_whitelists/client-selftest.whitelist	2014-04-08 10:16:22 +0000
+++ plainbox-provider-certification-client/provider_whitelists/client-selftest.whitelist	2014-04-08 20:07:34 +0000
@@ -82,6 +82,7 @@
 graphics/display
 graphics/minimum_resolution
 graphics/maximum_resolution
+graphics/\d_maximum_resolution.*
 graphics/xorg-failsafe
 graphics/xorg-process
 graphics/cycle_resolution

=== modified file 'providers/plainbox-provider-checkbox/jobs/graphics.txt.in'
--- providers/plainbox-provider-checkbox/jobs/graphics.txt.in	2014-04-07 16:49:50 +0000
+++ providers/plainbox-provider-checkbox/jobs/graphics.txt.in	2014-04-08 20:07:34 +0000
@@ -11,20 +11,28 @@
 estimated_duration: 0.018
 _description: Test to output the Xorg version
 
-plugin: manual
 id: graphics/resolution-change
-depends: graphics/xorg-version
-_description:
- PURPOSE:
-     This test will verify that the GUI is usable after manually changing resolution
- STEPS:
-     1. Open the Displays application
-     2. Select a new resolution from the dropdown list
-     3. Click on Apply
-     4. Select the original resolution from the dropdown list
-     5. Click on Apply
- VERIFICATION:
-     Did the resolution change as expected?
+requires: device.category == 'VIDEO'
+_description: Resolution change tests
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-interact-verify
+ id: graphics/`echo ${index}`_resolution-change_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ depends: graphics/xorg-version
+ _description:
+  PURPOSE:
+      This test will verify that the GUI is usable after manually changing resolution on the $product graphics card.
+  STEPS:
+      1. Select the $product graphics card (a reboot may be necessary)
+      2. Open the Displays application
+      3. Select a new resolution from the dropdown list
+      4. Click on Apply
+      5. Select the original resolution from the dropdown list
+      6. Click on Apply
+  VERIFICATION:
+      Did the resolution on the $product graphics card change as expected?
+ EOF
 
 plugin: shell
 id: graphics/xorg-process
@@ -64,7 +72,7 @@
  device.category == 'VIDEO'
  package.name == 'qmlscene'
 command: timeout 5 qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
-estimated_duration: 10
+estimated_duration: 10.0
 _description:
  PURPOSE:
      This test will verify the default display resolution
@@ -85,21 +93,30 @@
  .
  https://help.ubuntu.com/community/Installation/SystemRequirements
 
-plugin: user-verify
 id: graphics/maximum_resolution
-requires:
- device.category == 'VIDEO'
- package.name == 'zenity'
-command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
-estimated_duration: 10
-_description:
- PURPOSE:
-     This test will verify the display is operating at its maximum supported resolution 
- STEPS:
-     1. Consult the system's specifications and locate the screen's maximum supported resolution.
-     2. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
- VERIFICATION:
-     Is this the display's maximum resolution?
+requires: device.category == 'VIDEO'
+_description: Maximum resolution tests
+estimated_duration: 0.10
+plugin: local
+command:
+ cat <<'EOF' | run_templates -t -s 'graphics_card_resource'
+ plugin: user-verify
+ id: graphics/`echo $index`_maximum_resolution_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+ requires:
+  device.category == 'VIDEO'
+  package.name == 'zenity'
+ command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
+ estimated_duration: 10.0
+ _description:
+  PURPOSE:
+      This test will verify the display is operating at its maximum supported resolution on the $product graphics card. 
+  STEPS:
+      1. Select the $product graphics card (a reboot may be necessary)
+      2. Consult the system's specifications and locate the screen's maximum supported resolution.
+      3. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
+  VERIFICATION:
+      Is this the maximum resolution for the display connected to the $product graphics card?
+ EOF
 
 id: graphics/modes
 plugin: shell

=== added file 'providers/plainbox-provider-resource-generic/bin/graphics_card_resource'
--- providers/plainbox-provider-resource-generic/bin/graphics_card_resource	1970-01-01 00:00:00 +0000
+++ providers/plainbox-provider-resource-generic/bin/graphics_card_resource	2014-04-08 20:07:34 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+# graphics_card_resource was done as a script to be able to reuse it in
+# graphics tests that need to be generated per-card.
+udev_resource | filter_templates -w "category=VIDEO" | \
+awk "BEGIN {RS=\"\"; FS=\"\n\"} { print \"index:\", NR; print; print \"\" }"
+

=== modified file 'providers/plainbox-provider-resource-generic/jobs/resource.txt'
--- providers/plainbox-provider-resource-generic/jobs/resource.txt	2014-04-03 20:26:47 +0000
+++ providers/plainbox-provider-resource-generic/jobs/resource.txt	2014-04-08 20:07:34 +0000
@@ -196,3 +196,11 @@
  1- Write a job that places a suitably-formatted file in $PLAINBOX_SESSION_SHARE
  2- Update their whitelists to run that job *before* miscellanea/submission-resources
     or the "requirements" resource job.
+
+id: graphics_card
+estimated_duration: 0.05
+plugin: resource
+_description:
+ Generate an entry for each graphics card present in the system.
+command: graphics_card_resource
+