summaryrefslogtreecommitdiff
diff options
authorPierre Equoy <pierre.equoy@canonical.com>2016-11-15 15:12:11 +0800
committerPierre Equoy <pierre.equoy@canonical.com>2016-11-15 15:12:11 +0800
commitf05a11fc0ac4c0064fe079338448863e4d4df338 (patch)
tree90f12706790362b51e7685f1fd994f97cd9ed23b
parent8cdb5b412cce7715efabb79fefff2092d38c2202 (diff)
Filter out some jobs if discrete GPU can do offloading
If the device being tested has two GPUs (one integrated, one discrete), but the discrete GPU can perform GPU Offloading (i.e. can launch a specific program or game using the discrete GPU while using the intergrated one by default), then some jobs are not required to be run: typically, jobs that are handled by integrated GPU such as desktop-related tasks. LP: #1636060
-rw-r--r--jobs/audio.txt.in5
-rw-r--r--jobs/graphics.txt.in7
-rw-r--r--jobs/hibernate.txt.in2
-rw-r--r--jobs/monitor.txt.in12
-rw-r--r--jobs/suspend.txt.in10
5 files changed, 36 insertions, 0 deletions
diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index fc7c4c4..b9bf58b 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -38,6 +38,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::audio
id: audio/{index}_playback_hdmi_{product_slug}
@@ -65,6 +66,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::audio
id: audio/{index}_playback_displayport_{product_slug}
@@ -92,6 +94,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::audio
id: audio/{index}_playback_thunderbolt_{product_slug}
@@ -120,6 +123,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::audio
id: audio/{index}_playback_thunderbolt3_{product_slug}
@@ -148,6 +152,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::audio
id: audio/{index}_playback_type-c_displayport_{product_slug}
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index ad4bce2..cb50fd5 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -1,5 +1,6 @@
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::graphics
id: graphics/{index}_driver_version_{product_slug}
@@ -100,6 +101,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::graphics
id: graphics/{index}_minimum_resolution_{product_slug}
@@ -117,6 +119,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: graphics/{index}_maximum_resolution_{product_slug}
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::graphics
@@ -209,6 +212,7 @@ _summary: Test that VESA drivers are not in use
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::graphics
id: graphics/{index}_cycle_resolution_{product_slug}
@@ -229,6 +233,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::graphics
id: graphics/{index}_rotation_{product_slug}
@@ -249,6 +254,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::graphics
id: graphics/{index}_compiz_check_{product_slug}
@@ -390,6 +396,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: manual
category_id: 2013.com.canonical.plainbox::graphics
id: graphics/{index}_switch_card_{product_slug}
diff --git a/jobs/hibernate.txt.in b/jobs/hibernate.txt.in
index 954ef2c..e83b293 100644
--- a/jobs/hibernate.txt.in
+++ b/jobs/hibernate.txt.in
@@ -28,6 +28,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
requires:
sleep.disk == 'supported'
rtc.state == 'supported'
@@ -72,6 +73,7 @@ _description: attaches log from single hibernate/resume test to results
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: attachment
category_id: 2013.com.canonical.plainbox::hibernate
id: power-management/{index}_hibernate-single-log-attach_{product_slug}
diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index bd4b21e..cb12918 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -1,5 +1,6 @@
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_vga_{product_slug}
requires: display.vga == 'supported' or display.dp == 'supported'
plugin: manual
@@ -14,6 +15,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_dvi_{product_slug}
requires: display.dvi == 'supported'
plugin: manual
@@ -28,6 +30,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_displayport_{product_slug}
requires: display.dp == 'supported'
plugin: manual
@@ -42,6 +45,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_hdmi_{product_slug}
requires: display.hdmi == 'supported'
plugin: manual
@@ -56,6 +60,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_svideo_{product_slug}
requires: display.svideo == 'supported'
plugin: manual
@@ -70,6 +75,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_rca_{product_slug}
requires: display.rca == 'supported'
plugin: manual
@@ -84,6 +90,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_multi-head_{product_slug}
requires: dmi.product in ['Desktop','Low Profile Desktop','Tower','Mini Tower', 'Space-saving']
plugin: manual
@@ -101,6 +108,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_powersaving_{product_slug}
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::monitor
@@ -115,6 +123,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_dim_brightness_{product_slug}
requires: dmi.product in ['Notebook','Laptop','Portable','All In One','All-In-One','AIO']
plugin: user-interact-verify
@@ -132,6 +141,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_thunderbolt_{product_slug}
imports: from 2013.com.canonical.plainbox import manifest
requires: manifest.has_thunderbolt == 'True'
@@ -152,6 +162,7 @@ _verification:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
id: monitor/{index}_thunderbolt3_{product_slug}
imports: from 2013.com.canonical.plainbox import manifest
requires: manifest.has_thunderbolt3 == 'True'
@@ -173,6 +184,7 @@ _verification:
unit: template
template-resource: graphics_card
id: monitor/{index}_type-c_displayport_{product_slug}
+template-filter: graphics_card.prime_gpu_offload == 'Off'
imports: from 2013.com.canonical.plainbox import manifest
requires: manifest.has_usb_type_c == 'True'
estimated_duration: 15.0
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index d304970..533a5ce 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -15,6 +15,7 @@ command: xrandr -q |grep '*'| awk '{print $1}' > $PLAINBOX_SESSION_SHARE/resolut
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_resolution_before_suspend_{product_slug}
@@ -234,6 +235,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_suspend_after_switch_to_card_{product_slug}
@@ -316,6 +318,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: attachment
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_suspend-single-log-attach_{product_slug}
@@ -355,6 +358,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_suspend-time-check_{product_slug}
@@ -415,6 +419,7 @@ command: xrandr -q |grep '*'| awk '{print $1}' | diff $PLAINBOX_SESSION_SHARE/re
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_resolution_after_suspend_{product_slug}
@@ -596,6 +601,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: manual
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_display_after_suspend_{product_slug}
@@ -1515,6 +1521,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: user-interact-verify
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}
@@ -1550,6 +1557,7 @@ _description: This attaches screenshots from the suspend/cycle_resolutions_after
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: attachment
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_xrandr_screens_after_suspend.tar.gz
@@ -2699,6 +2707,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_compiz_check_after_suspend_{product_slug}
@@ -2796,6 +2805,7 @@ _description:
unit: template
template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
plugin: shell
category_id: 2013.com.canonical.plainbox::suspend
id: suspend/{index}_driver_version_after_suspend_{product_slug}