Merge "Revert "Cleanup after zipping to save space on constrained nodes e.g. Berlin""
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index f6498c9..0b73874 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -279,18 +279,12 @@
gzip error-report.log || true
- rm error-report.log
-
cd $WORKSPACE/kind-voltha/scripts/logger/combined/
tar czf $WORKSPACE/container-logs.tgz *
- rm *
-
cd $WORKSPACE
gzip *-combined.log || true
- rm *-combined.log
-
# collect ETCD cluster logs
mkdir -p $WORKSPACE/etcd
printf '%s\n' $(kubectl get pods -l app=etcd -o=jsonpath="{.items[*]['metadata.name']}") | xargs -I@ bash -c "kubectl logs @ > $WORKSPACE/etcd/@.log"
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 7bcf7d3..15eaad7 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -273,18 +273,12 @@
gzip error-report.log || true
- rm error-report.log
-
cd $WORKSPACE/kind-voltha/scripts/logger/combined/
tar czf $WORKSPACE/container-logs.tgz *
- rm *
-
cd $WORKSPACE
gzip *-combined.log || true
- rm *-combined.log
-
# collect ETCD cluster logs
mkdir -p $WORKSPACE/etcd
printf '%s\n' $(kubectl get pods -l app=etcd -o=jsonpath="{.items[*]['metadata.name']}") | xargs -I@ bash -c "kubectl logs @ > $WORKSPACE/etcd/@.log"
diff --git a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
index c6f893a..687fb66 100644
--- a/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-tt-physical-functional-tests.groovy
@@ -216,17 +216,11 @@
gzip error-report.log || true
- rm error-report.log
-
cd $WORKSPACE/kind-voltha/scripts/logger/combined/
tar czf $WORKSPACE/container-logs.tgz *
- rm *
-
cd $WORKSPACE
gzip *-combined.log || true
-
- rm *-combined.log
'''
script {
deployment_config.olts.each { olt ->