summaryrefslogtreecommitdiff
path: root/units
diff options
authorPierre Equoy <pierre.equoy@canonical.com>2016-01-15 12:31:50 +0800
committerPierre Equoy <pierre.equoy@canonical.com>2016-01-15 12:31:50 +0800
commitc9018f36ee5a5c24e8cf4c962b096582ccb1d41a (patch)
treeae9d17274057a24f0e78142fb083b5c461404a44 /units
parentda276c388624f5052bdf3d9b266821892b0f4f07 (diff)
plainbox-provider-checkbox: local jobs migrated to unit templates, test plans adapted
All local jobs have been migrated to unit templates. This sometimes required to use new resource jobs (mir, fwts). Test plans that were still using generators have been adapted to use unit templates instead. That means to call the proper resource jobs in the 'bootstrap_include' section of the test plans. Finally, the 'user_apps' jobs have been removed. They were not used by any test plans, not even on the OEM side. Warning: checkbox-cli is not compatible with unit templates. The test plans have to be run using a session assitant compatible tool such as checkbox-cli2 or checkbox-converged.
Diffstat (limited to 'units')
-rw-r--r--units/autotesting.pxu11
-rw-r--r--units/default.pxu12
2 files changed, 7 insertions, 16 deletions
diff --git a/units/autotesting.pxu b/units/autotesting.pxu
index c2d64e1..a20b0e6 100644
--- a/units/autotesting.pxu
+++ b/units/autotesting.pxu
@@ -40,7 +40,6 @@ include:
cpu/scaling_test-log-attach
cpu/offlining_test
cpu/topology
- disk/read_performance
disk/read_performance_.*
graphics/xorg-version
graphics/1_compiz_check_.*
@@ -103,11 +102,5 @@ include:
suspend/screenshot_after_suspend
screenshot_after_suspend.jpg
bootstrap_include:
- disk/read_performance
- graphics/generator_compiz_check
- graphics/generator_screenshot
- graphics/generator_screenshot.jpg
- graphics/generator_screenshot_fullscreen_video
- graphics/generator_screenshot_fullscreen_video.jpg
- graphics/generator_screenshot_fullscreen_video
- graphics/generator_screenshot_fullscreen_video.jpg
+ device
+ graphics_card
diff --git a/units/default.pxu b/units/default.pxu
index 7b47f99..a869278 100644
--- a/units/default.pxu
+++ b/units/default.pxu
@@ -3,6 +3,9 @@ _name: Default Tests
unit: test plan
include:
optical_drive
+ benchmarks/disk/hdparm-read.*
+ benchmarks/disk/hdparm-cache-read.*
+ optical/read_.*
miscellanea/submission-resources
miscellanea/is_laptop
codecs_attachment
@@ -105,10 +108,5 @@ include:
usb/storage-automated
usb/remove
bootstrap_include:
- benchmarks/disk/hdparm-read
- benchmarks/disk/hdparm-cache-read
- optical/read
- graphics/generator_compiz_check
- graphics/generator_resolution
- graphics/generator_minimum_resolution
- graphics/generator_driver_version
+ device
+ graphics_card