VOL-3180 Improve collection of OLT logs
Change-Id: I5a79fbcead4a83d36af6db89debceeb4b4661821
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index 8395eeb..f841a8a 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -272,8 +272,6 @@
steps {
script {
deployment_config.olts.each { olt ->
- sh returnStdout: false, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service openolt stop' || true"
- sh returnStdout: false, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'killall dev_mgmt_daemon' || true"
sh returnStdout: false, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --remove asfvolt16 && dpkg --purge asfvolt16'"
waitUntil {
olt_sw_present = sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --list | grep asfvolt16 | wc -l'"
@@ -304,13 +302,8 @@
deployment_config.olts.each { olt ->
sh returnStdout: false, script: """
ssh-keyscan -H ${olt.ip} >> ~/.ssh/known_hosts
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service openolt stop' || true
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'killall dev_mgmt_daemon' || true
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'rm -f /var/log/openolt.log'
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'rm -f /var/log/dev_mgmt_daemon.log'
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service dev_mgmt_daemon start &'
- sleep 5
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service openolt start &'
+ sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'rm -f /var/log/openolt.log; rm -f /var/log/dev_mgmt_daemon.log; reboot'
+ sleep 120
"""
waitUntil {
onu_discovered = sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'grep \"onu discover indication\" /var/log/openolt.log | wc -l'"
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index b544d8a..1241ecd 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -210,6 +210,8 @@
sh returnStdout: false, script: """
sshpass -p ${olt.pass} scp ${olt.user}@${olt.ip}:/var/log/openolt.log $WORKSPACE/openolt-${olt.ip}.log || true
sed -i 's/\\x1b\\[[0-9;]*[a-zA-Z]//g' $WORKSPACE/openolt-${olt.ip}.log # Remove escape sequences
+ sshpass -p ${olt.pass} scp ${olt.user}@${olt.ip}:/var/log/dev_mgmt_daemon.log $WORKSPACE/dev_mgmt_daemon-${olt.ip}.log || true
+ sed -i 's/\\x1b\\[[0-9;]*[a-zA-Z]//g' $WORKSPACE/dev_mgmt_daemon-${olt.ip}.log # Remove escape sequences
"""
}
}
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index ee1fa0c..ab3066b 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -121,8 +121,8 @@
name: 'verify_physical_voltha_patchset_auto'
build-node: 'tucson-pod'
config-pod: 'tucson-pod'
- oltDebVersionMaster: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb'
- oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb'
+ oltDebVersionMaster: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2-preserve-logs.deb'
+ oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2-preserve-logs.deb'
profile: 'Default'
# Per-patchset Pod builds on Tucson pod
@@ -130,8 +130,8 @@
name: 'verify_physical_voltha_patchset_manual'
build-node: 'tucson-pod'
config-pod: 'tucson-pod'
- oltDebVersionMaster: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb'
- oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb'
+ oltDebVersionMaster: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2-preserve-logs.deb'
+ oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2-preserve-logs.deb'
profile: 'Default'
# Manual build job for Tucson pod
@@ -141,8 +141,8 @@
build-node: 'tucson-pod'
config-pod: 'tucson-pod'
manualBranch: 'master'
- oltDebVersionMaster: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb'
- oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb'
+ oltDebVersionMaster: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2-preserve-logs.deb'
+ oltDebVersionVoltha23: 'openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2-preserve-logs.deb'
profile: 'Default'
- job-template: