diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 3e6aeb9..1dd57f5 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -424,16 +424,12 @@
       cd "${logsDir}"
 
       echo "** Available logs:"
-      /bin/ls -l "\$logsDir"
+      /bin/ls -l "$logsDir"
       echo
 
-      declare -i count=0
-      count=\$(find . -name '*-combined.log' -print | wc -l)
-      if [[ $count -gt 0 ]]; then
-          echo '** Bundle combined log'
-          gzip "${logs[@]}"
-          rm -f "${logs[@]}"
-      fi
+      echo '** Bundle combined log'
+      gzip *-combined.log || true
+      rm -f *-combined.log || true
 
       echo -e '** Gather robot Framework logs: LEAVE\n'
     """)
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index 825edd3..4491bb7 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -427,14 +427,9 @@
       /bin/ls -l "$logsDir"
       echo
 
-      # readarray -t logs < <(find . -name '*-combined.log' -print)
-      declare -i count=0
-      count=\$(find . -name '*-combined.log' -print | wc -l)
-      if [[ $count -gt 0 ]]; then
-          echo '** Bundle combined log'
-          gzip "${logs[@]}"
-          rm -f "${logs[@]}"
-      fi
+      echo '** Bundle combined log'
+      gzip *-combined.log || true
+      rm -f *-combined.log || true
 
       echo -e '** Gather robot Framework logs: LEAVE\n'
     """)