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
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:
396396
397unit: template397unit: template
398template-resource: graphics_card398template-resource: graphics_card
399template-filter: graphics_card.prime_gpu_offload == 'Off'
400plugin: manual399plugin: manual
401category_id: 2013.com.canonical.plainbox::graphics400category_id: 2013.com.canonical.plainbox::graphics
402id: graphics/{index}_switch_card_{product_slug}401id: graphics/{index}_switch_card_{product_slug}
@@ -415,6 +414,7 @@ _verification:
415414
416unit: template415unit: template
417template-resource: graphics_card416template-resource: graphics_card
417template-filter: graphics_card.prime_gpu_offload == 'Off'
418plugin: manual418plugin: manual
419category_id: 2013.com.canonical.plainbox::graphics419category_id: 2013.com.canonical.plainbox::graphics
420id: graphics/{index}_switch_card_{product_slug}_xenial420id: 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 @@
1unit: template1unit: template
2template-resource: graphics_card2template-resource: graphics_card
3template-filter: graphics_card.prime_gpu_offload == 'Off'
3plugin: shell4plugin: shell
4category_id: 2013.com.canonical.plainbox::suspend5category_id: 2013.com.canonical.plainbox::suspend
5id: suspend/{index}_resolution_before_suspend_{product_slug}_xenial6id: suspend/{index}_resolution_before_suspend_{product_slug}_xenial
@@ -12,6 +13,7 @@ command:
1213
13unit: template14unit: template
14template-resource: graphics_card15template-resource: graphics_card
16template-filter: graphics_card.prime_gpu_offload == 'Off'
15plugin: user-interact-verify17plugin: user-interact-verify
16category_id: 2013.com.canonical.plainbox::suspend18category_id: 2013.com.canonical.plainbox::suspend
17id: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial19id: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
@@ -46,6 +48,7 @@ _description:
4648
47unit: template49unit: template
48template-resource: graphics_card50template-resource: graphics_card
51template-filter: graphics_card.prime_gpu_offload == 'Off'
49plugin: shell52plugin: shell
50category_id: 2013.com.canonical.plainbox::suspend53category_id: 2013.com.canonical.plainbox::suspend
51id: suspend/{index}_resolution_after_suspend_{product_slug}_xenial54id: suspend/{index}_resolution_after_suspend_{product_slug}_xenial
@@ -58,6 +61,7 @@ command:
5861
59unit: template62unit: template
60template-resource: graphics_card63template-resource: graphics_card
64template-filter: graphics_card.prime_gpu_offload == 'Off'
61plugin: manual65plugin: manual
62category_id: 2013.com.canonical.plainbox::suspend66category_id: 2013.com.canonical.plainbox::suspend
63id: suspend/{index}_display_after_suspend_{product_slug}_xenial67id: suspend/{index}_display_after_suspend_{product_slug}_xenial
@@ -73,6 +77,7 @@ _description:
7377
74unit: template78unit: template
75template-resource: graphics_card79template-resource: graphics_card
80template-filter: graphics_card.prime_gpu_offload == 'Off'
76plugin: user-interact-verify81plugin: user-interact-verify
77category_id: 2013.com.canonical.plainbox::suspend82category_id: 2013.com.canonical.plainbox::suspend
78id: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial83id: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial
@@ -92,6 +97,7 @@ _description:
9297
93unit: template98unit: template
94template-resource: graphics_card99template-resource: graphics_card
100template-filter: graphics_card.prime_gpu_offload == 'Off'
95plugin: attachment101plugin: attachment
96category_id: 2013.com.canonical.plainbox::suspend102category_id: 2013.com.canonical.plainbox::suspend
97id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_xenial103id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_xenial
@@ -101,6 +107,7 @@ _description: This attaches screenshots from the suspend/cycle_resolutions_after
101107
102unit: template108unit: template
103template-resource: graphics_card109template-resource: graphics_card
110template-filter: graphics_card.prime_gpu_offload == 'Off'
104plugin: shell111plugin: shell
105category_id: 2013.com.canonical.plainbox::suspend112category_id: 2013.com.canonical.plainbox::suspend
106id: suspend/{index}_compiz_check_after_suspend_{product_slug}_xenial113id: suspend/{index}_compiz_check_after_suspend_{product_slug}_xenial
@@ -158,6 +165,7 @@ _description:
158165
159unit: template166unit: template
160template-resource: graphics_card167template-resource: graphics_card
168template-filter: graphics_card.prime_gpu_offload == 'Off'
161plugin: shell169plugin: shell
162category_id: 2013.com.canonical.plainbox::suspend170category_id: 2013.com.canonical.plainbox::suspend
163id: suspend/{index}_driver_version_after_suspend_{product_slug}_xenial171id: suspend/{index}_driver_version_after_suspend_{product_slug}_xenial
@@ -171,6 +179,7 @@ _summary: Test X driver/version after suspend for {vendor} {product}
171179
172unit: template180unit: template
173template-resource: graphics_card181template-resource: graphics_card
182template-filter: graphics_card.prime_gpu_offload == 'Off'
174plugin: attachment183plugin: attachment
175category_id: 2013.com.canonical.plainbox::suspend184category_id: 2013.com.canonical.plainbox::suspend
176id: suspend/{index}_suspend-single-log-attach_{product_slug}_xenial185id: suspend/{index}_suspend-single-log-attach_{product_slug}_xenial
@@ -181,6 +190,7 @@ _description:
181190
182unit: template191unit: template
183template-resource: graphics_card192template-resource: graphics_card
193template-filter: graphics_card.prime_gpu_offload == 'Off'
184plugin: shell194plugin: shell
185category_id: 2013.com.canonical.plainbox::suspend195category_id: 2013.com.canonical.plainbox::suspend
186id: suspend/{index}_suspend-time-check_{product_slug}_xenial196id: suspend/{index}_suspend-time-check_{product_slug}_xenial

Subscribers

People subscribed via source and target branches