From 42bc6f1e033aec713157037c1e9369c8cba77db2 Mon Sep 17 00:00:00 2001
From: Elod Illes <elod.illes@est.tech>
Date: Fri, 31 Jan 2020 17:49:22 +0100
Subject: [PATCH] Do not gzip files under logs in job results

In zuul job results the 'logs' directory contains gzip'd files which are
now unbrowsable. This happened due to changes in swift behavior [1].

This patch removes unnecessary compression of files under logs
directory.

[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-January/011875.html

Change-Id: I1d0e7869d418612bb9a20fdf01da2641693ed8bb
---
 functions.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/functions.sh b/functions.sh
index cdc475b7..2cb6c0fc 100644
--- a/functions.sh
+++ b/functions.sh
@@ -558,7 +558,6 @@ function process_testr_artifacts {
         sudo /usr/os-testr-env/bin/subunit2html \
             $log_path/testrepository.subunit $log_path/testr_results.html
         archive_test_artifact $log_path/testrepository.subunit
-        archive_test_artifact $log_path/testr_results.html
     fi
 }
 
@@ -602,8 +601,6 @@ function process_stackviz {
             $log_path/stackviz/data
     fi
     sudo chown -R $USER:$USER $log_path/stackviz
-    # Compress the stackviz data as it is quite large.
-    sudo find $log_path/stackviz -iname '*.json' -execdir gzip -9 {} \+
     popd
 }
 
@@ -831,13 +828,11 @@ function cleanup_host {
 
     if [ `command -v dpkg` ]; then
         dpkg -l> $WORKSPACE/dpkg-l.txt
-        gzip -9 dpkg-l.txt
-        sudo mv $WORKSPACE/dpkg-l.txt.gz $BASE/logs/
+        sudo mv $WORKSPACE/dpkg-l.txt $BASE/logs/
     fi
     if [ `command -v rpm` ]; then
         rpm -qa | sort > $WORKSPACE/rpm-qa.txt
-        gzip -9 rpm-qa.txt
-        sudo mv $WORKSPACE/rpm-qa.txt.gz $BASE/logs/
+        sudo mv $WORKSPACE/rpm-qa.txt $BASE/logs/
     fi
 
     if [[ "$PROCESS_STACKVIZ" -eq "1" ]] ; then
@@ -933,10 +928,7 @@ function cleanup_host {
     # final memory usage and process list
     ps -eo user,pid,ppid,lwp,%cpu,%mem,size,rss,cmd > $BASE/logs/ps.txt
 
-    # Compress all text logs
-    sudo find $BASE/logs -iname '*.txt' -execdir gzip -9 {} \+
-    sudo find $BASE/logs -iname '*.dat' -execdir gzip -9 {} \+
-    sudo find $BASE/logs -iname '*.conf' -execdir gzip -9 {} \+
+    # Compress journal
     sudo find $BASE/logs -iname '*.journal' -execdir xz --threads=0 {} \+
 
     # Disable detailed logging as we return to the main script