Checkbox Provider - Base

Merge ~jocave/plainbox-provider-checkbox:remove-base64-and-archiving-in-jobs into plainbox-provider-checkbox:master

  1. Git
  2. lp:~jocave/plainbox-provider-checkbox
  3. remove-base64-and-archiving-in-jobs
  4. Merge into master
Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: 494fe1a1073e8bc44e8ddfc64a6843305e11213d
Merged at revision: 0b1326cda4fda4d765650b1d32237e1845c03af3
Proposed branch: ~jocave/plainbox-provider-checkbox:remove-base64-and-archiving-in-jobs
Merge into: plainbox-provider-checkbox:master
Diff against target: 510 lines (+45/-95)
11 files modified
dev/null (+0/-46)
po/POTFILES.in (+0/-1)
units/firmware/jobs.pxu (+3/-3)
units/graphics/jobs.pxu (+5/-5)
units/graphics/legacy.pxu (+6/-6)
units/info/jobs.pxu (+4/-4)
units/miscellanea/jobs.pxu (+5/-5)
units/power-management/jobs.pxu (+2/-3)
units/stress/jobs.pxu (+11/-12)
units/suspend/suspend-graphics.pxu (+1/-2)
units/suspend/suspend.pxu (+8/-8)
Reviewer Review Type Date Requested Status
Pierre Equoy Approve
Jonathan Cave (community) Needs Resubmitting
Review via email: mp+334111@code.launchpad.net

Description of the change

Changes to tidy up the provider as a consequence of moving away from XML submissions.

First commit removes base64 encoding of attachments and, in some situations, compressing of files. Note that in cases where the job id included a file extension that was no longer used the job id was updated and as a result a follow up MR is required for plainbox-provider-certification-client.

Second commit removes the xml_sanitize script and is use on the udev attachment job.

To post a comment you must log in.
Revision history for this message
Pierre Equoy (pieq) wrote :

I think we don't need to remove the compression part, especially since some logs can get *really* big.

For example, I think firmware/fwts_desktop_diagnosis_results_hwe.log.gz should remain a log.gz and that its command should just go from

[ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log | base64

to

[ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log

review: Needs Fixing
Revision history for this message
Jonathan Cave (jocave) wrote :

I've put the compression back as it was on all the fwts jobs. There shouldnt be any job ID changes present now either.

review: Needs Resubmitting
Revision history for this message
Pierre Equoy (pieq) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/xml_sanitize b/bin/xml_sanitize
2deleted file mode 100755
3index 7d43b83..0000000
4--- a/bin/xml_sanitize
5+++ /dev/null
6@@ -1,46 +0,0 @@
7-#!/usr/bin/env python3
8-import errno
9-import io
10-import sys
11-
12-from argparse import ArgumentParser, FileType
13-
14-VALID_XML_CHARS = frozenset([0x9, 0xA, 0xD] +
15- list(range(0x20, 0xD7FF)) +
16- list(range(0xE000, 0xFFFD)) +
17- list(range(0x10000, 0x10FFFF)))
18-
19-
20-def is_valid_xml_char(ch):
21- # Is this character valid in XML?
22- # http://www.w3.org/TR/xml/#charsets
23- return ord(ch) in VALID_XML_CHARS
24-
25-
26-def main():
27- parser = ArgumentParser("Receives as input some text and outputs "
28- "the same text without characters which are "
29- "not valid in the XML specification.")
30- parser.add_argument('input_file',
31- type=FileType('r'),
32- nargs='?',
33- help='The name of the file to sanitize.')
34- args = parser.parse_args()
35-
36- if args.input_file:
37- text = ''.join([c for c in args.input_file.read() if
38- is_valid_xml_char(c)])
39-
40- else:
41- with io.TextIOWrapper(
42- sys.stdin.buffer, encoding='UTF-8', errors="ignore") as stdin:
43- text = ''.join([c for c in stdin.read() if is_valid_xml_char(c)])
44-
45- print(text)
46-
47-if __name__ == "__main__":
48- try:
49- sys.exit(main())
50- except Exception as err:
51- if err.errno != errno.EPIPE:
52- raise(err)
53diff --git a/po/POTFILES.in b/po/POTFILES.in
54index faace3d..7d289d8 100644
55--- a/po/POTFILES.in
56+++ b/po/POTFILES.in
57@@ -141,7 +141,6 @@ bin/tomcat_test
58 [type: gettext/python] bin/window_test
59 bin/wireless_ext
60 bin/xen_test
61-[type: gettext/python] bin/xml_sanitize
62 [type: gettext/python] bin/xrandr_cycle
63 [type: gettext/python] manage.py
64 src/clocktest.c
65diff --git a/units/firmware/jobs.pxu b/units/firmware/jobs.pxu
66index 7c777a2..3095273 100644
67--- a/units/firmware/jobs.pxu
68+++ b/units/firmware/jobs.pxu
69@@ -18,7 +18,7 @@ id: firmware/fwts_{name}.log
70 estimated_duration: 1.2
71 requires: package.name == 'fwts'
72 user: root
73-command: [[ -e $PLAINBOX_SESSION_SHARE/fwts_{name}.log ]] && xz -c $PLAINBOX_SESSION_SHARE/fwts_{name}.log | base64
74+command: [[ -e $PLAINBOX_SESSION_SHARE/fwts_{name}.log ]] && xz -c $PLAINBOX_SESSION_SHARE/fwts_{name}.log
75 _description: Attach log for FWTS {name} test.
76 _summary: Attach log for FWTS {name} test.
77
78@@ -55,7 +55,7 @@ category_id: com.canonical.plainbox::firmware
79 estimated_duration: 0.5
80 id: firmware/fwts_desktop_diagnosis_results.log.gz
81 command:
82- [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log | base64
83+ [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log
84 _description: Attaches the FWTS desktop diagnosis results log to the submission
85 _summary: Attach FWTS desktop diagnosis log to submission
86
87@@ -64,7 +64,7 @@ category_id: com.canonical.plainbox::firmware
88 estimated_duration: 0.5
89 id: firmware/fwts_desktop_diagnosis_results_hwe.log.gz
90 command:
91- [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log | base64
92+ [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log
93 _description: Attaches the FWTS desktop diagnosis results log to the submission (to HWE)
94 _summary: Attach FWTS desktop diagnosis log to submission (to HWE)
95
96diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
97index ce38c30..261a527 100644
98--- a/units/graphics/jobs.pxu
99+++ b/units/graphics/jobs.pxu
100@@ -126,7 +126,7 @@ category_id: com.canonical.plainbox::graphics
101 requires:
102 device.category == 'VIDEO'
103 package.name == 'zenity'
104-command:
105+command:
106 source graphics_env {driver} {index}
107 maxi="$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{{print $1}}')"
108 now="$(python3 -c 'from gi.repository import Gdk; screen=Gdk.Screen.get_default(); geo = screen.get_monitor_geometry(screen.get_primary_monitor()); print(geo.width, "x", geo.height, sep="")')"
109@@ -403,7 +403,7 @@ plugin: attachment
110 category_id: com.canonical.plainbox::graphics
111 id: graphics/{index}_screenshot_{product_slug}.jpg
112 depends: graphics/{index}_screenshot_{product_slug}
113-command: base64 $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg
114+command: cat $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg
115 _description: Attaches the screenshot captured in graphics/screenshot for the {vendor} {product} graphics card.
116 _summary: Attach results of screenshot test for {vendor} {product}
117
118@@ -480,7 +480,7 @@ plugin: attachment
119 category_id: com.canonical.plainbox::graphics
120 id: graphics/{index}_screenshot_fullscreen_video_{product_slug}.jpg
121 depends: graphics/{index}_screenshot_fullscreen_video_{product_slug}
122-command: base64 $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg
123+command: cat $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg
124 _summary: Attach results of FSV screenshot test for {vendor} {product}
125 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video for the {vendor} {product} graphics card
126
127@@ -499,7 +499,7 @@ id: screen-capture-internal.png
128 _summary: Attaches a simple screen capture
129 estimated_duration: 1.0
130 depends: graphics/screen-capture-internal
131-command: [ -f ${PLAINBOX_SESSION_SHARE}/screen-capture.png ] && base64 ${PLAINBOX_SESSION_SHARE}/screen-capture.png
132+command: [ -f ${PLAINBOX_SESSION_SHARE}/screen-capture.png ] && cat ${PLAINBOX_SESSION_SHARE}/screen-capture.png
133 _description: Attaches the simple screen capture file
134
135 unit: template
136@@ -521,7 +521,7 @@ id: graphics/{index}_screen-capture-internal_{product_slug}.png
137 depends: graphics/{index}_screen-capture-internal_{product_slug}
138 _summary: Attaches a simple screen capture of {vendor} {product}
139 estimated_duration: 1.0
140-command: [ -f $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png ] && base64 $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
141+command: [ -f $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png ] && cat $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
142 _description: Attaches the simple screen capture file of {vendor} {product}
143
144 unit: template
145diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
146index 91eb888..5e8fe82 100644
147--- a/units/graphics/legacy.pxu
148+++ b/units/graphics/legacy.pxu
149@@ -84,7 +84,7 @@ estimated_duration: 10
150 _summary: Test maximum supported resolution
151 _description:
152 PURPOSE:
153- This test will verify the display is operating at its maximum supported resolution
154+ This test will verify the display is operating at its maximum supported resolution
155 STEPS:
156 1. Consult the system's specifications and locate the screen's maximum supported resolution.
157 2. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
158@@ -97,7 +97,7 @@ category_id: com.canonical.plainbox::graphics
159 command: graphics_modes_info
160 estimated_duration: 0.250
161 _description: Collect info on graphics modes (screen resolution and refresh rate)
162-_summary: Collect info on graphics modes
163+_summary: Collect info on graphics modes
164
165 id: graphics/color_depth
166 plugin: shell
167@@ -228,7 +228,7 @@ category_id: com.canonical.plainbox::graphics
168 id: graphics/screenshot
169 requires: package.name == 'fswebcam'
170 command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot.jpg -q 2>&1 | ansi_parser
171-_summary: Test grabbing a screenshot
172+_summary: Test grabbing a screenshot
173 _description:
174 PURPOSE:
175 Take a screengrab of the current screen (logged on Unity desktop)
176@@ -241,9 +241,9 @@ plugin: attachment
177 category_id: com.canonical.plainbox::graphics
178 id: screenshot.jpg
179 depends: graphics/screenshot
180-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
181+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
182 _description: Attaches the screenshot captured in graphics/screenshot.
183-_summary: Attach results of screenshot test
184+_summary: Attach results of screenshot test
185
186 plugin: shell
187 category_id: com.canonical.plainbox::graphics
188@@ -271,6 +271,6 @@ plugin: attachment
189 category_id: com.canonical.plainbox::graphics
190 id: screenshot_fullscreen_video.jpg
191 depends: graphics/screenshot_fullscreen_video
192-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
193+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
194 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.
195 _summary: Attach results of FSV screenshot test
196diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
197index 12ad318..2e21195 100644
198--- a/units/info/jobs.pxu
199+++ b/units/info/jobs.pxu
200@@ -176,7 +176,7 @@ requires:
201 id: udev_attachment
202 plugin: attachment
203 category_id: com.canonical.plainbox::info
204-command: udevadm info --export-db | xml_sanitize
205+command: udevadm info --export-db
206 estimated_duration: 1.465
207 _description: Attaches a dump of the udev database showing system hardware information.
208 _summary: Attach dump of udev database
209@@ -275,14 +275,14 @@ command:
210 plugin: attachment
211 category_id: com.canonical.plainbox::info
212 id: installer_bootchart.tgz
213-command: [ -f /var/log/installer/bootchart.tgz ] && base64 /var/log/installer/bootchart.tgz
214+command: [ -f /var/log/installer/bootchart.tgz ] && cat /var/log/installer/bootchart.tgz
215 _description: Attach the installer bootchart tarball if it exists.
216
217 plugin: attachment
218 category_id: com.canonical.plainbox::info
219 id: installer_debug.gz
220 user: root
221-command: [ -f /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug | base64
222+command: [ -f /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug
223 estimated_duration: 0.1
224 _description: Attaches the installer debug log if it exists.
225
226@@ -408,7 +408,7 @@ id: info/kvm_output
227 estimated_duration: 0.1
228 _summary:
229 Attaches console log from the kvm_check_vm test
230-_description:
231+_description:
232 Attaches the debug log from the virtualization/kvm_check_vm test
233 to the results submission.
234 command: [ -f $PLAINBOX_SESSION_SHARE/virt_debug ] && cat $PLAINBOX_SESSION_SHARE/virt_debug
235diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu
236index a253cd4..10df43d 100644
237--- a/units/miscellanea/jobs.pxu
238+++ b/units/miscellanea/jobs.pxu
239@@ -96,7 +96,7 @@ id: miscellanea/fwts_results.log
240 requires:
241 package.name == 'fwts'
242 command:
243- [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_results.log | base64
244+ [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_results.log
245 _description: Attaches the miscellanes/fwts_test results log to the submission.
246
247 plugin: attachment
248@@ -106,7 +106,7 @@ id: miscellanea/fwts_results_hwe.log.gz
249 requires:
250 package.name == 'fwts'
251 command:
252- [ -f $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log | base64
253+ [ -f $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log
254 _description: Attaches the FWTS results log to the submission (to HWE)
255 _summary: Attach FWTS log to submission (to HWE)
256
257@@ -208,7 +208,7 @@ _summary:
258 plugin: shell
259 category_id: com.canonical.plainbox::miscellanea
260 id: miscellanea/dmitest_client
261-requires:
262+requires:
263 package.name == 'dmidecode'
264 dmi_present.state == 'supported'
265 estimated_duration: 0.5
266@@ -306,7 +306,7 @@ category_id: com.canonical.plainbox::miscellanea
267 estimated_duration: 0.5
268 id: miscellanea/oops_results.log
269 command:
270- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log | base64
271+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log
272 _description: Attaches the FWTS oops results log to the submission
273
274 plugin: shell
275@@ -359,7 +359,7 @@ id: miscellanea/sosreport_attachment
276 depends: miscellanea/sosreport
277 user: root
278 command:
279- SOSFILE=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1`; [ -e ${SOSFILE} ] && base64 $SOSFILE
280+ SOSFILE=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1`; [ -e ${SOSFILE} ] && cat $SOSFILE
281 _summary: Attach the baseline sosreport file
282
283 plugin: shell
284diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu
285index 2521f81..ce252fc 100644
286--- a/units/power-management/jobs.pxu
287+++ b/units/power-management/jobs.pxu
288@@ -51,7 +51,7 @@ id: power-management/poweroff-log-attach
289 estimated_duration: 1.0
290 command:
291 set -o pipefail
292- tar cvz $PLAINBOX_SESSION_SHARE/*poweroff.1.log | base64
293+ more $PLAINBOX_SESSION_SHARE/*poweroff.1.log | cat
294 _description:
295 This will attach any logs from the power-management/poweroff test to the results.
296
297@@ -74,7 +74,7 @@ id: power-management/reboot-log-attach
298 estimated_duration: 1.0
299 command:
300 set -o pipefail
301- tar cvz $PLAINBOX_SESSION_SHARE/*reboot.1.log | base64
302+ more $PLAINBOX_SESSION_SHARE/*reboot.1.log | cat
303 _description:
304 This will attach any logs from the power-management/reboot test to the results.
305
306@@ -254,4 +254,3 @@ _description:
307 successfully otherwise, Select 'Fail' to indicate there was a problem.
308 VERIFICATION:
309 Did the system shutdown and boot correctly?
310-
311diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
312index d1a8146..2a2a7d0 100644
313--- a/units/stress/jobs.pxu
314+++ b/units/stress/jobs.pxu
315@@ -125,7 +125,7 @@ category_id: com.canonical.plainbox::stress
316 id: power-management/suspend-30-cycle-log-attach
317 estimated_duration: 1.0
318 depends: power-management/suspend_30_cycles
319-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log | base64
320+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
321 _description:
322 Attaches the log from the 30 cycle Suspend/Resume test if it exists
323
324@@ -134,7 +134,7 @@ category_id: com.canonical.plainbox::stress
325 id: power-management/suspend-30-cycle-log-attach-with-reboots
326 estimated_duration: 1.0
327 depends: power-management/suspend_30_cycles_with_reboots
328-command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && xz -c $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log | base64
329+command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && cat $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
330 _description:
331 Attaches the log from the '30 cycle Suspend/Resume and one reboot times 3' test if it exists
332
333@@ -238,7 +238,7 @@ estimated_duration: 1.0
334 depends: stress/reboot
335 command:
336 set -o pipefail
337- tar cvz $PLAINBOX_SESSION_SHARE/*reboot.100.log | base64
338+ more $PLAINBOX_SESSION_SHARE/*reboot.100.log | cat
339
340 plugin: shell
341 category_id: com.canonical.plainbox::stress
342@@ -260,7 +260,7 @@ id: stress/reboot_30_log
343 depends: stress/reboot_30
344 command:
345 set -o pipefail
346- tar cvz $PLAINBOX_SESSION_SHARE/*reboot.30.log | base64
347+ more $PLAINBOX_SESSION_SHARE/*reboot.30.log | cat
348
349 plugin: shell
350 category_id: com.canonical.plainbox::stress
351@@ -283,7 +283,7 @@ estimated_duration: 1.0
352 depends: stress/poweroff
353 command:
354 set -o pipefail
355- tar cvz $PLAINBOX_SESSION_SHARE/*poweroff.100.log | base64
356+ more $PLAINBOX_SESSION_SHARE/*poweroff.100.log | cat
357
358 plugin: shell
359 category_id: com.canonical.plainbox::stress
360@@ -305,7 +305,7 @@ id: stress/poweroff_30_log
361 depends: stress/poweroff_30
362 command:
363 set -o pipefail
364- tar cvz $PLAINBOX_SESSION_SHARE/*poweroff.30.log | base64
365+ more $PLAINBOX_SESSION_SHARE/*poweroff.30.log | cat
366
367 plugin: shell
368 category_id: com.canonical.plainbox::stress
369@@ -322,7 +322,7 @@ estimated_duration: 1.0
370 depends: stress/reboot_30_check
371 command:
372 set -o pipefail
373- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.30.log | base64
374+ more $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.30.log | cat
375
376 plugin: shell
377 category_id: com.canonical.plainbox::stress
378@@ -339,7 +339,7 @@ estimated_duration: 1.0
379 depends: stress/poweroff_30_check
380 command:
381 set -o pipefail
382- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.30.log | base64
383+ more $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.30.log | cat
384
385 plugin: shell
386 category_id: com.canonical.plainbox::stress
387@@ -356,7 +356,7 @@ estimated_duration: 1.0
388 depends: stress/reboot_check
389 command:
390 set -o pipefail
391- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log | base64
392+ more $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log | cat
393
394 plugin: shell
395 category_id: com.canonical.plainbox::stress
396@@ -373,7 +373,7 @@ estimated_duration: 1.0
397 depends: stress/poweroff_check
398 command:
399 set -o pipefail
400- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log | base64
401+ more $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log | cat
402
403 plugin: shell
404 category_id: com.canonical.plainbox::stress
405@@ -393,7 +393,7 @@ id: stress/graphics-tarball
406 estimated_duration: 1.0
407 requires:
408 package.name == 'x11-apps'
409-command: [ -f $PLAINBOX_SESSION_SHARE/graphics-stress-results ] && tar cvz $PLAINBOX_SESSION_SHARE/graphics-stress-results | base64
410+command: [ -f $PLAINBOX_SESSION_SHARE/graphics-stress-results ] && cat $PLAINBOX_SESSION_SHARE/graphics-stress-results
411 _description: Attaches the graphics stress results to the submission.
412
413 plugin: shell
414@@ -453,4 +453,3 @@ _description:
415 2. Press wifi hotkey at a rate of 1 press per second and slowly increase the speed of the tap, until you are tapping as fast as possible
416 VERIFICATION:
417 Verify the system is not frozen and the wifi and bluetooth applets are still visible and functional
418-
419diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
420index c85d147..1d42896 100644
421--- a/units/suspend/suspend-graphics.pxu
422+++ b/units/suspend/suspend-graphics.pxu
423@@ -102,7 +102,7 @@ plugin: attachment
424 category_id: com.canonical.plainbox::suspend
425 id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_xenial
426 depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial
427-command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
428+command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
429 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
430
431 unit: template
432@@ -198,4 +198,3 @@ depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
433 estimated_duration: 1.2
434 command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log
435 _description: Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
436-
437diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
438index 4b09bbd..e65a5fa 100644
439--- a/units/suspend/suspend.pxu
440+++ b/units/suspend/suspend.pxu
441@@ -300,7 +300,7 @@ plugin: attachment
442 category_id: com.canonical.plainbox::suspend
443 id: suspend/suspend-single-log-attach
444 depends: suspend/suspend_advanced_auto
445-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_single.log | base64
446+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_single.log
447 _description:
448 Attaches the log from the single suspend/resume test to the results
449
450@@ -311,7 +311,7 @@ plugin: attachment
451 category_id: com.canonical.plainbox::suspend
452 id: suspend/{index}_suspend-single-log-attach_{product_slug}
453 depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
454-command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log | base64
455+command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log
456 _description:
457 Attaches the log from the single suspend/resume test to the results
458
459@@ -332,7 +332,7 @@ plugin: attachment
460 category_id: com.canonical.plainbox::suspend
461 id: suspend/{index}_hybrid-sleep-single-log-attach_{product_slug}
462 depends: suspend/{index}_hybrid_sleep_{product_slug}
463-command: [ -e $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log | base64
464+command: [ -e $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log ] && cat $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log
465 _description:
466 Attaches the log from the single hybrid sleep/resume test to the results
467
468@@ -1151,7 +1151,7 @@ plugin: attachment
469 category_id: com.canonical.plainbox::suspend
470 id: suspend/xrandr_screens_after_suspend.tar.gz
471 depends: suspend/cycle_resolutions_after_suspend
472-command: [ -f $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
473+command: [ -f $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
474 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
475
476 unit: template
477@@ -1161,7 +1161,7 @@ plugin: attachment
478 category_id: com.canonical.plainbox::suspend
479 id: suspend/{index}_xrandr_screens_after_suspend.tar.gz
480 depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}
481-command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
482+command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
483 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
484
485 plugin: shell
486@@ -1201,7 +1201,7 @@ _description:
487 plugin: attachment
488 category_id: com.canonical.plainbox::suspend
489 id: suspend/suspend-auto-single-log-attach
490-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_auto_single_log | base64
491+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && cat $PLAINBOX_SESSION_SHARE/suspend_auto_single_log
492 _description:
493 Attaches the log from the single suspend/resume test to the results
494
495@@ -1224,7 +1224,7 @@ plugin: attachment
496 category_id: com.canonical.plainbox::suspend
497 id: screenshot_after_suspend.jpg
498 depends: suspend/screenshot_after_suspend
499-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
500+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
501 _description: Attaches the screenshot captured in graphics/screenshot.
502
503 plugin: shell
504@@ -2308,5 +2308,5 @@ plugin: attachment
505 category_id: com.canonical.plainbox::suspend
506 estimated_duration: 0.5
507 command:
508- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log | base64
509+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log
510 _description: Attaches the FWTS oops results log to the submission after suspend

Subscribers

People subscribed via source and target branches