VOL-2598 Capture all logs in container-logs.tgz
Change-Id: I07826b2c58177411317ce0c4a87dd4e36a3aced9
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index 6593a95..33da214 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -88,6 +88,7 @@
cd $WORKSPACE/kind-voltha/scripts
./log-collector.sh > /dev/null &
+ ./log-combine.sh > /dev/null &
make -C $WORKSPACE/voltha-system-tests ${makeTarget} || true
'''
@@ -105,14 +106,12 @@
kubectl get pods -o wide
kubectl get pods -n voltha -o wide
- sleep 15 # Wait for log-collector to complete
- cd $WORKSPACE/kind-voltha/scripts
- timeout 10 ./log-combine.sh
+ sleep 60 # Wait for log-collector and log-combine to complete
+
+ cd $WORKSPACE/kind-voltha/scripts/logger/combined/
+ tar czf $WORKSPACE/container-logs.tgz *
cd $WORKSPACE
- cp $WORKSPACE/kind-voltha/scripts/logger/combined/*.0001 $WORKSPACE
- tar czf container-logs.tgz *.0001
-
gzip *-combined.log || true
## shut down voltha
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 633fccb..7993e2d 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -74,6 +74,7 @@
sh """
cd $WORKSPACE/kind-voltha/scripts
./log-collector.sh > /dev/null &
+ ./log-combine.sh > /dev/null &
mkdir -p $ROBOT_LOGS_DIR
if ( ${released} ); then
@@ -130,14 +131,12 @@
kubectl get nodes -o wide
kubectl get pods -n voltha -o wide
- sleep 15 # Wait for log-collector to complete
- cd $WORKSPACE/kind-voltha/scripts
- timeout 10 ./log-combine.sh
+ sleep 60 # Wait for log-collector and log-combine to complete
+
+ cd $WORKSPACE/kind-voltha/scripts/logger/combined/
+ tar czf $WORKSPACE/container-logs.tgz *
cd $WORKSPACE
- cp $WORKSPACE/kind-voltha/scripts/logger/combined/*.0001 $WORKSPACE
- tar czf container-logs.tgz *.0001
-
gzip *-combined.log || true
'''
script {