Remove base64 encoding and archiving/compression of collections of files

2 files changed, 11 insertions, 11 deletions

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index ce38c30..261a527 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -126,7 +126,7 @@ category_id: com.canonical.plainbox::graphics
 requires:
 device.category == 'VIDEO'
 package.name == 'zenity'
-command: 
+command:
 source graphics_env {driver} {index}
 maxi="$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{{print $1}}')"
 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="")')"
@@ -403,7 +403,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_screenshot_{product_slug}.jpg
 depends: graphics/{index}_screenshot_{product_slug}
-command: base64 $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg
+command: cat $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg
 _description: Attaches the screenshot captured in graphics/screenshot for the {vendor} {product} graphics card.
 _summary: Attach results of screenshot test for {vendor} {product}
 
@@ -480,7 +480,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_screenshot_fullscreen_video_{product_slug}.jpg
 depends: graphics/{index}_screenshot_fullscreen_video_{product_slug}
-command: base64 $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg
+command: cat $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg
 _summary: Attach results of FSV screenshot test for {vendor} {product}
 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video for the {vendor} {product} graphics card
 
@@ -499,7 +499,7 @@ id: screen-capture-internal.png
 _summary: Attaches a simple screen capture
 estimated_duration: 1.0
 depends: graphics/screen-capture-internal
-command: [ -f ${PLAINBOX_SESSION_SHARE}/screen-capture.png ] && base64 ${PLAINBOX_SESSION_SHARE}/screen-capture.png
+command: [ -f ${PLAINBOX_SESSION_SHARE}/screen-capture.png ] && cat ${PLAINBOX_SESSION_SHARE}/screen-capture.png
 _description: Attaches the simple screen capture file
 
 unit: template
@@ -521,7 +521,7 @@ id: graphics/{index}_screen-capture-internal_{product_slug}.png
 depends: graphics/{index}_screen-capture-internal_{product_slug}
 _summary: Attaches a simple screen capture of {vendor} {product}
 estimated_duration: 1.0
-command: [ -f $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png ] && base64 $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
+command: [ -f $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png ] && cat $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
 _description: Attaches the simple screen capture file of {vendor} {product}
 
 unit: template
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index 91eb888..5e8fe82 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -84,7 +84,7 @@ estimated_duration: 10
 _summary: Test maximum supported resolution
 _description:
 PURPOSE:
- This test will verify the display is operating at its maximum supported resolution 
+ This test will verify the display is operating at its maximum supported resolution
 STEPS:
 1. Consult the system's specifications and locate the screen's maximum supported resolution.
 2. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
@@ -97,7 +97,7 @@ category_id: com.canonical.plainbox::graphics
 command: graphics_modes_info
 estimated_duration: 0.250
 _description: Collect info on graphics modes (screen resolution and refresh rate)
-_summary: Collect info on graphics modes 
+_summary: Collect info on graphics modes
 
 id: graphics/color_depth
 plugin: shell
@@ -228,7 +228,7 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/screenshot
 requires: package.name == 'fswebcam'
 command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot.jpg -q 2>&1 | ansi_parser
-_summary: Test grabbing a screenshot 
+_summary: Test grabbing a screenshot
 _description:
 PURPOSE:
 Take a screengrab of the current screen (logged on Unity desktop)
@@ -241,9 +241,9 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: screenshot.jpg
 depends: graphics/screenshot
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
-_summary: Attach results of screenshot test 
+_summary: Attach results of screenshot test
 
 plugin: shell
 category_id: com.canonical.plainbox::graphics
@@ -271,6 +271,6 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: screenshot_fullscreen_video.jpg
 depends: graphics/screenshot_fullscreen_video
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.
 _summary: Attach results of FSV screenshot test