Checkbox Provider - Base

Merge ~pieq/plainbox-provider-checkbox:fix-1636060-round2 into plainbox-provider-checkbox:master

  1. Git
  2. lp:~pieq/plainbox-provider-checkbox
  3. fix-1636060-round2
  4. Merge into master
Proposed by Pierre Equoy
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 41881acf847a0029b5c5716c7eda05a63680ee7c
Merged at revision: 5cbd9b2054b1ea05e26c9e626657f201207f4f56
Proposed branch: ~pieq/plainbox-provider-checkbox:fix-1636060-round2
Merge into: plainbox-provider-checkbox:master
Diff against target: 103 lines (+11/-1)
2 files modified
jobs/graphics.txt.in (+1/-1)
jobs/suspend-graphics.txt.in (+10/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+312627@code.launchpad.net

Description of the change

For some reason, the graphics-related suspend jobs didn't get the template filtering upgrade they were supposed to get. This MR fixes this.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1 (so easy to apply a fix to the wrong template job)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
2index cb50fd5..225489f 100644
3--- a/jobs/graphics.txt.in
4+++ b/jobs/graphics.txt.in
5@@ -396,7 +396,6 @@ _description:
6
7 unit: template
8 template-resource: graphics_card
9-template-filter: graphics_card.prime_gpu_offload == 'Off'
10 plugin: manual
11 category_id: 2013.com.canonical.plainbox::graphics
12 id: graphics/{index}_switch_card_{product_slug}
13@@ -415,6 +414,7 @@ _verification:
14
15 unit: template
16 template-resource: graphics_card
17+template-filter: graphics_card.prime_gpu_offload == 'Off'
18 plugin: manual
19 category_id: 2013.com.canonical.plainbox::graphics
20 id: graphics/{index}_switch_card_{product_slug}_xenial
21diff --git a/jobs/suspend-graphics.txt.in b/jobs/suspend-graphics.txt.in
22index 9a35da2..4b6d7b7 100644
23--- a/jobs/suspend-graphics.txt.in
24+++ b/jobs/suspend-graphics.txt.in
25@@ -1,5 +1,6 @@
26 unit: template
27 template-resource: graphics_card
28+template-filter: graphics_card.prime_gpu_offload == 'Off'
29 plugin: shell
30 category_id: 2013.com.canonical.plainbox::suspend
31 id: suspend/{index}_resolution_before_suspend_{product_slug}_xenial
32@@ -12,6 +13,7 @@ command:
33
34 unit: template
35 template-resource: graphics_card
36+template-filter: graphics_card.prime_gpu_offload == 'Off'
37 plugin: user-interact-verify
38 category_id: 2013.com.canonical.plainbox::suspend
39 id: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
40@@ -46,6 +48,7 @@ _description:
41
42 unit: template
43 template-resource: graphics_card
44+template-filter: graphics_card.prime_gpu_offload == 'Off'
45 plugin: shell
46 category_id: 2013.com.canonical.plainbox::suspend
47 id: suspend/{index}_resolution_after_suspend_{product_slug}_xenial
48@@ -58,6 +61,7 @@ command:
49
50 unit: template
51 template-resource: graphics_card
52+template-filter: graphics_card.prime_gpu_offload == 'Off'
53 plugin: manual
54 category_id: 2013.com.canonical.plainbox::suspend
55 id: suspend/{index}_display_after_suspend_{product_slug}_xenial
56@@ -73,6 +77,7 @@ _description:
57
58 unit: template
59 template-resource: graphics_card
60+template-filter: graphics_card.prime_gpu_offload == 'Off'
61 plugin: user-interact-verify
62 category_id: 2013.com.canonical.plainbox::suspend
63 id: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial
64@@ -92,6 +97,7 @@ _description:
65
66 unit: template
67 template-resource: graphics_card
68+template-filter: graphics_card.prime_gpu_offload == 'Off'
69 plugin: attachment
70 category_id: 2013.com.canonical.plainbox::suspend
71 id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_xenial
72@@ -101,6 +107,7 @@ _description: This attaches screenshots from the suspend/cycle_resolutions_after
73
74 unit: template
75 template-resource: graphics_card
76+template-filter: graphics_card.prime_gpu_offload == 'Off'
77 plugin: shell
78 category_id: 2013.com.canonical.plainbox::suspend
79 id: suspend/{index}_compiz_check_after_suspend_{product_slug}_xenial
80@@ -158,6 +165,7 @@ _description:
81
82 unit: template
83 template-resource: graphics_card
84+template-filter: graphics_card.prime_gpu_offload == 'Off'
85 plugin: shell
86 category_id: 2013.com.canonical.plainbox::suspend
87 id: suspend/{index}_driver_version_after_suspend_{product_slug}_xenial
88@@ -171,6 +179,7 @@ _summary: Test X driver/version after suspend for {vendor} {product}
89
90 unit: template
91 template-resource: graphics_card
92+template-filter: graphics_card.prime_gpu_offload == 'Off'
93 plugin: attachment
94 category_id: 2013.com.canonical.plainbox::suspend
95 id: suspend/{index}_suspend-single-log-attach_{product_slug}_xenial
96@@ -181,6 +190,7 @@ _description:
97
98 unit: template
99 template-resource: graphics_card
100+template-filter: graphics_card.prime_gpu_offload == 'Off'
101 plugin: shell
102 category_id: 2013.com.canonical.plainbox::suspend
103 id: suspend/{index}_suspend-time-check_{product_slug}_xenial

Subscribers

People subscribed via source and target branches