From 41881acf847a0029b5c5716c7eda05a63680ee7c Mon Sep 17 00:00:00 2001 From: Pierre Equoy Date: Wed, 7 Dec 2016 16:28:38 +0800 Subject: Add missing template filtering to suspend jobs Some filtering was missing for suspend jobs to complete lp:1636060. In addition, the filtering for the graphics card switch job was changed to the xenial-related job, since this is where we need this new template filtering. LP: #1636060 --- jobs/graphics.txt.in | 2 +- jobs/suspend-graphics.txt.in | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in index cb50fd5..225489f 100644 --- a/jobs/graphics.txt.in +++ b/jobs/graphics.txt.in @@ -396,7 +396,6 @@ _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} @@ -415,6 +414,7 @@ _verification: 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}_xenial diff --git a/jobs/suspend-graphics.txt.in b/jobs/suspend-graphics.txt.in index 9a35da2..4b6d7b7 100644 --- a/jobs/suspend-graphics.txt.in +++ b/jobs/suspend-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::suspend id: suspend/{index}_resolution_before_suspend_{product_slug}_xenial @@ -12,6 +13,7 @@ command: 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}_xenial @@ -46,6 +48,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}_resolution_after_suspend_{product_slug}_xenial @@ -58,6 +61,7 @@ command: 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}_xenial @@ -73,6 +77,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}_xenial @@ -92,6 +97,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}_xrandr_screens_after_suspend.tar_gz_xenial @@ -101,6 +107,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: shell category_id: 2013.com.canonical.plainbox::suspend id: suspend/{index}_compiz_check_after_suspend_{product_slug}_xenial @@ -158,6 +165,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}_xenial @@ -171,6 +179,7 @@ _summary: Test X driver/version after suspend for {vendor} {product} 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}_xenial @@ -181,6 +190,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}_xenial -- cgit v1.2.3