Merge "Keeping the file around while gzipping"
diff --git a/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy b/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
index e0a0871..82a27ec 100755
--- a/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/periodic-bbsim-tests.groovy
@@ -90,7 +90,7 @@
             done
           fi
           cd $WORKSPACE/${testTarget}-components/
-          gzip onos-voltha-startup-combined.log
+          gzip -k onos-voltha-startup-combined.log
           rm onos-voltha-startup-combined.log
         """
       }
@@ -131,7 +131,7 @@
         done
       fi
       cd $WORKSPACE/${testTarget}-components/
-      gzip onos-voltha-combined.log
+      gzip -k onos-voltha-combined.log
       rm onos-voltha-combined.log
     """
     getPodsInfo("$WORKSPACE/${testTarget}-components")
diff --git a/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
index 9d990a1..c689c0e 100755
--- a/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
@@ -143,7 +143,7 @@
               done
             fi
             cd $WORKSPACE/1t1gem/
-            gzip onos-voltha-combined.log
+            gzip -k onos-voltha-combined.log
             rm onos-voltha-combined.log
             # get pods information
             kubectl get pods -o wide --all-namespaces > $WORKSPACE/1t1gem/pods.txt || true
@@ -198,7 +198,7 @@
               done
             fi
             cd $WORKSPACE/1t4gem/
-            gzip onos-voltha-combined.log
+            gzip -k onos-voltha-combined.log
             rm onos-voltha-combined.log
             # get pods information
             kubectl get pods -o wide --all-namespaces > $WORKSPACE/1t4gem/pods.txt || true
@@ -253,7 +253,7 @@
               done
             fi
             cd $WORKSPACE/1t8gem/
-            gzip onos-voltha-combined.log
+            gzip -k onos-voltha-combined.log
             rm onos-voltha-combined.log
             # get pods information
             kubectl get pods -o wide --all-namespaces > $WORKSPACE/1t8gem/pods.txt || true
@@ -310,7 +310,7 @@
                done
              fi
              cd $WORKSPACE/mib/
-             gzip onos-voltha-combined.log
+             gzip -k onos-voltha-combined.log
              rm onos-voltha-combined.log
              # get pods information
              kubectl get pods -o wide --all-namespaces > $WORKSPACE/mib/pods.txt || true
@@ -372,7 +372,7 @@
                done
              fi
              cd $WORKSPACE/reconciledt/
-             gzip onos-voltha-combined.log
+             gzip -k onos-voltha-combined.log
              rm onos-voltha-combined.log
              # get pods information
              kubectl get pods -o wide --all-namespaces > $WORKSPACE/reconciledt/pods.txt || true
@@ -440,7 +440,7 @@
                done
              fi
              cd $WORKSPACE/reconcileatt/
-             gzip onos-voltha-combined.log
+             gzip -k onos-voltha-combined.log
              rm onos-voltha-combined.log
              # get pods information
              kubectl get pods -o wide --all-namespaces > $WORKSPACE/reconcileatt/pods.txt || true
@@ -502,7 +502,7 @@
                done
              fi
              cd $WORKSPACE/reconcilett/
-             gzip onos-voltha-combined.log
+             gzip -k onos-voltha-combined.log
              rm onos-voltha-combined.log
              # get pods information
              kubectl get pods -o wide --all-namespaces > $WORKSPACE/reconcilett/pods.txt || true