Checkbox Provider - Base

Merge ~sylvain-pineau/plainbox-provider-checkbox:fwts-exec-from-snap into plainbox-provider-checkbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-checkbox
  3. fwts-exec-from-snap
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: eedb5c04a5e4441cd79172d3dbf3db51e0108a64
Merged at revision: e25e3235f749f3241d3571e07a2ffb526c86b9cd
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:fwts-exec-from-snap
Merge into: plainbox-provider-checkbox:master
Diff against target: 219 lines (+20/-35)
6 files modified
units/cpu/jobs.pxu (+3/-6)
units/firmware/jobs.pxu (+4/-6)
units/miscellanea/jobs.pxu (+4/-8)
units/power-management/jobs.pxu (+4/-7)
units/stress/jobs.pxu (+4/-6)
units/suspend/suspend.pxu (+1/-2)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+337214@code.launchpad.net

Description of the change

Allow fwts based jobs to run from a snap (by checking the executable resource)

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

only keep the executable resource checks

review: Needs Resubmitting
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved, tested executable resource contains fwts with deb install and inside a snap: ok.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
2index bdea273..bf23af7 100644
3--- a/units/cpu/jobs.pxu
4+++ b/units/cpu/jobs.pxu
5@@ -2,8 +2,7 @@ plugin: shell
6 category_id: com.canonical.plainbox::cpu
7 id: cpu/scaling_test
8 estimated_duration: 150.0
9-requires:
10- package.name == 'fwts' or executable.name == 'fwts'
11+requires: executable.name == 'fwts'
12 user: root
13 environ: PLAINBOX_SESSION_SHARE LD_LIBRARY_PATH SNAP
14 command:
15@@ -32,8 +31,7 @@ plugin: shell
16 category_id: com.canonical.plainbox::cpu
17 id: cpu/maxfreq_test
18 estimated_duration: 0.6
19-requires:
20- package.name == 'fwts' or executable.name == 'fwts'
21+requires: executable.name == 'fwts'
22 cpuinfo.platform in ("i386", "x86_64")
23 user: root
24 environ: LD_LIBRARY_PATH SNAP
25@@ -117,8 +115,7 @@ _description:
26 plugin:shell
27 id: cpu/cstates
28 estimated_duration: 10.0
29-requires:
30- package.name == 'fwts' or executable.name == 'fwts'
31+requires: executable.name == 'fwts'
32 user: root
33 _summary:
34 Run C-States tests
35diff --git a/units/firmware/jobs.pxu b/units/firmware/jobs.pxu
36index 3095273..5c8dcee 100644
37--- a/units/firmware/jobs.pxu
38+++ b/units/firmware/jobs.pxu
39@@ -4,7 +4,7 @@ plugin: shell
40 category_id: com.canonical.plainbox::firmware
41 id: firmware/fwts_{name}
42 estimated_duration: 1.2
43-requires: package.name == 'fwts'
44+requires: executable.name == 'fwts'
45 user: root
46 command: checkbox-support-fwts_test -t {name} -l $PLAINBOX_SESSION_SHARE/fwts_{name}.log
47 _description: Run {name} test from Firmware Test Suite.
48@@ -16,7 +16,7 @@ plugin: attachment
49 category_id: com.canonical.plainbox::firmware
50 id: firmware/fwts_{name}.log
51 estimated_duration: 1.2
52-requires: package.name == 'fwts'
53+requires: executable.name == 'fwts'
54 user: root
55 command: [[ -e $PLAINBOX_SESSION_SHARE/fwts_{name}.log ]] && xz -c $PLAINBOX_SESSION_SHARE/fwts_{name}.log
56 _description: Attach log for FWTS {name} test.
57@@ -26,8 +26,7 @@ plugin:shell
58 category_id: com.canonical.plainbox::firmware
59 id: firmware/fwts_desktop_diagnosis
60 estimated_duration: 10.0
61-requires:
62- package.name == 'fwts'
63+requires: executable.name == 'fwts'
64 user: root
65 _description:
66 Run Firmware Test Suite (fwts) QA-concerned desktop-specific diagnosis tests.
67@@ -40,8 +39,7 @@ plugin:shell
68 category_id: com.canonical.plainbox::firmware
69 id: firmware/fwts_desktop_diagnosis_hwe
70 estimated_duration: 5.0
71-requires:
72- package.name == 'fwts'
73+requires: executable.name == 'fwts'
74 user: root
75 _description:
76 Run Firmware Test Suite (fwts) HWE-concerned desktop-specific diagnosis tests.
77diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu
78index 10df43d..2071f06 100644
79--- a/units/miscellanea/jobs.pxu
80+++ b/units/miscellanea/jobs.pxu
81@@ -67,8 +67,7 @@ plugin: shell
82 category_id: com.canonical.plainbox::miscellanea
83 id: miscellanea/fwts_test
84 estimated_duration: 1.2
85-requires:
86- package.name == 'fwts'
87+requires: executable.name == 'fwts'
88 user: root
89 _description:
90 Run Firmware Test Suite (fwts) automated tests.
91@@ -93,8 +92,7 @@ command: fwupdate -s
92 plugin: attachment
93 category_id: com.canonical.plainbox::miscellanea
94 id: miscellanea/fwts_results.log
95-requires:
96- package.name == 'fwts'
97+requires: executable.name == 'fwts'
98 command:
99 [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_results.log
100 _description: Attaches the miscellanes/fwts_test results log to the submission.
101@@ -103,8 +101,7 @@ plugin: attachment
102 category_id: com.canonical.plainbox::miscellanea
103 estimated_duration: 0.5
104 id: miscellanea/fwts_results_hwe.log.gz
105-requires:
106- package.name == 'fwts'
107+requires: executable.name == 'fwts'
108 command:
109 [ -f $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log
110 _description: Attaches the FWTS results log to the submission (to HWE)
111@@ -292,8 +289,7 @@ _description:
112 plugin:shell
113 id: miscellanea/oops
114 estimated_duration: 10.0
115-requires:
116- package.name == 'fwts'
117+requires: executable.name == 'fwts'
118 user: root
119 _description:
120 Run Firmware Test Suite (fwts) oops tests.
121diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu
122index ce252fc..976f814 100644
123--- a/units/power-management/jobs.pxu
124+++ b/units/power-management/jobs.pxu
125@@ -19,8 +19,7 @@ environ: PLAINBOX_SESSION_SHARE
126 estimated_duration: 25.0
127 user: root
128 _description: Test ACPI Wakealarm (fwts wakealarm)
129-requires:
130- package.name == 'fwts' or executable.name == 'fwts'
131+requires: executable.name == 'fwts'
132 command: checkbox-support-fwts_test -f aborted -t wakealarm -l $PLAINBOX_SESSION_SHARE/fwts-wakealarm.log
133
134 plugin: attachment
135@@ -38,8 +37,7 @@ estimated_duration: 120.0
136 depends: power-management/fwts_wakealarm
137 user: root
138 environ: PLAINBOX_SESSION_SHARE
139-requires:
140- package.name == 'fwts'
141+requires: executable.name == 'fwts'
142 command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
143 flags: noreturn autorestart
144 _description:
145@@ -61,8 +59,7 @@ id: power-management/reboot
146 estimated_duration: 120.0
147 user: root
148 environ: PLAINBOX_SESSION_SHARE
149-requires:
150- package.name == 'fwts'
151+requires: executable.name == 'fwts'
152 command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
153 flags: noreturn autorestart
154 _description:
155@@ -196,7 +193,7 @@ estimated_duration: 140.0
156 user: root
157 requires:
158 package.name == 'upower'
159- package.name == 'fwts'
160+ executable.name == 'fwts'
161 depends: power-management/unplug_ac
162 _description: Checks the battery drain during suspend. Reports time and capacity until empty.
163 command:
164diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
165index 2a2a7d0..b5bb254 100644
166--- a/units/stress/jobs.pxu
167+++ b/units/stress/jobs.pxu
168@@ -222,8 +222,7 @@ plugin: shell
169 category_id: com.canonical.plainbox::stress
170 id: stress/reboot
171 estimated_duration: 4500.0
172-requires:
173- package.name == 'fwts'
174+requires: executable.name == 'fwts'
175 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
176 flags: noreturn autorestart
177 user: root
178@@ -243,8 +242,7 @@ command:
179 plugin: shell
180 category_id: com.canonical.plainbox::stress
181 id: stress/reboot_30
182-requires:
183- package.name == 'fwts'
184+requires: executable.name == 'fwts'
185 executable.name == 'x-terminal-emulator'
186 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
187 flags: noreturn autorestart
188@@ -267,7 +265,7 @@ category_id: com.canonical.plainbox::stress
189 id: stress/poweroff
190 estimated_duration: 4500.0
191 requires:
192- package.name == 'fwts'
193+ executable.name == 'fwts'
194 executable.name == 'x-terminal-emulator'
195 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
196 flags: noreturn autorestart
197@@ -289,7 +287,7 @@ plugin: shell
198 category_id: com.canonical.plainbox::stress
199 id: stress/poweroff_30
200 requires:
201- package.name == 'fwts'
202+ executable.name == 'fwts'
203 executable.name == 'x-terminal-emulator'
204 command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --r 30 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
205 flags: noreturn autorestart
206diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
207index 6704a2f..a862390 100644
208--- a/units/suspend/suspend.pxu
209+++ b/units/suspend/suspend.pxu
210@@ -2292,8 +2292,7 @@ id: suspend/oops_after_suspend
211 depends: suspend/suspend_advanced
212 plugin:shell
213 estimated_duration: 10.0
214-requires:
215- package.name == 'fwts'
216+requires: executable.name == 'fwts'
217 user: root
218 _description:
219 Run Firmware Test Suite (fwts) oops tests after suspend.

Subscribers

People subscribed via source and target branches