VOL-3180 Improve collection of OLT logs

Change-Id: I651c3c135939c76df2791984353194dfb9607cc2
diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index b18c3c5..029a32d 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -219,7 +219,7 @@
                         timeout(5) {
                             sh returnStdout: true, script: """
                             ssh-keyscan -H ${deployment_config.olts[i].ip} >> ~/.ssh/known_hosts
-                            sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'reboot' || true
+                            sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'rm -f /var/log/openolt.log; rm -f /var/log/dev_mgmt_daemon.log; reboot' || true
                             sleep 120
                             """
                         }
diff --git a/libraries/utils.robot b/libraries/utils.robot
index bda4aef..6abfdf4 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -402,12 +402,21 @@
         ...    ${src['ip']}    ${src['user']}    ${src['pass']}   ${src['container_type']}    ${src['container_name']}
     END
 
+Echo Message to OLT Logs
+    [Arguments]    ${message}
+    [Documentation]     Echoes ${message} into the OLT logs
+    Execute Remote Command    printf '%s\n' '' '' '${message}' '' >> /var/log/openolt.log
+    ...    ${olt_ip}    ${olt_user}    ${olt_pass}
+    Execute Remote Command    printf '%s\n' '' '' '${message}' '' >> /var/log/dev_mgmt_daemon.log
+    ...    ${olt_ip}    ${olt_user}    ${olt_pass}
+
 Start Logging
     [Arguments]    ${label}
     [Documentation]    Start logging for test ${label}
     ${kail_process}=     Run Keyword If    "${container_log_dir}" != "${None}"   Start Process    kail    -n    default
     ...    -n    voltha    cwd=${container_log_dir}   stdout=${label}-combined.log
     Set Test Variable    ${kail_process}
+    Run Keyword If    ${has_dataplane}    Echo Message to OLT Logs     START ${label}
 
 Stop Logging
     [Arguments]    ${label}
@@ -417,6 +426,7 @@
     ${test_logfile}=    Run Keyword If    "${container_log_dir}" != "${None}"
     ...    Join Path    ${container_log_dir}    ${label}-combined.log
     Run Keyword If Test Passed    Run Keyword If    "${test_logfile}" != "${None}"    Remove File    ${test_logfile}
+    Run Keyword If    ${has_dataplane}    Echo Message to OLT Logs     END ${label}
 
 Clean Up Linux
     [Documentation]    Kill processes and clean up interfaces on src+dst servers