Merge ~kissiel/plainbox-provider-checkbox:fix-card-switch-on-nvidia into plainbox-provider-checkbox:master

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 5ea9878aade445f996805b947f6e99dc4e9cf5ff
Merged at revision: 41cec3d8df7533b6b9aaed57bf855a9647becf0e
Proposed branch: ~kissiel/plainbox-provider-checkbox:fix-card-switch-on-nvidia
Merge into: plainbox-provider-checkbox:master
Diff against target: 13 lines (+1/-1)
1 file modified
units/graphics/jobs.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+352756@code.launchpad.net

Description of the change

fix skips of nvidia card switch on xenial

When the graphics_card resource job is run while intel card is chosen the discrete GPU will have its driver identified as 'pcieport'. This was not recognized by the graphics/{index}_switch_card_{product_slug}_xenial job.

Fixes: LP: #1765637

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

weird, but ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
2index 88efe86..9a0ae7c 100644
3--- a/units/graphics/jobs.pxu
4+++ b/units/graphics/jobs.pxu
5@@ -456,7 +456,7 @@ plugin: manual
6 category_id: com.canonical.plainbox::graphics
7 id: graphics/{index}_switch_card_{product_slug}_xenial
8 requires:
9- graphics_card.driver in ['nouveau', 'nvidia', 'amdgpu-pro']
10+ graphics_card.driver in ['nouveau', 'nvidia', 'amdgpu-pro', 'pcieport']
11 lsb.codename == 'xenial'
12 _summary: Test GPU switching for {vendor} {product}
13 _description:

Subscribers

People subscribed via source and target branches