[VOL-3580] Fix issue with re-install of OLT in master builds
Change-Id: Iec4e4a14850269f92b57d17c61cb08723a572f2e
diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 61e9f44..8fcf242 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -297,7 +297,7 @@
fi
if [[ "${branch}" == "master" ]] && [[ "${params.inBandManagement}" == "true" ]]; then
ssh-keyscan -H ${deployment_config.olts[i].sship} >> ~/.ssh/known_hosts
- sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'kill -9 `pgrep -f "bash /opt/openolt/openolt_dev_mgmt_daemon_process_watchdog"` || true'
+ sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'kill -9 `pgrep -f "[b]ash /opt/openolt/openolt_dev_mgmt_daemon_process_watchdog"` || true'
sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} "dpkg --install ${deployment_config.olts[i].oltDebVersion}"
fi
if [[ "${branch}" == "master" ]] && [[ "${params.inBandManagement}" == "false" ]]; then
diff --git a/tests/functional/Voltha_FailureScenarios.robot b/tests/functional/Voltha_FailureScenarios.robot
index 767fede..5da7c2b 100644
--- a/tests/functional/Voltha_FailureScenarios.robot
+++ b/tests/functional/Voltha_FailureScenarios.robot
@@ -651,7 +651,7 @@
Verify ONU Soft Reboot
[Documentation] Test soft reboot of the ONU using voltctl command
- [Tags] VOL-1957 ONUSoftReboot functional notready
+ [Tags] VOL-1957 ONUSoftReboot functional
[Setup] Start Logging ONUSoftReboot
#... AND Setup
[Teardown] Run Keywords Collect Logs
@@ -716,6 +716,8 @@
Run Keyword and Ignore Error Get Device Output from Voltha ${onu_device_id}
Run Keyword And Ignore Error Collect Logs
END
+ Run Keyword If ${has_dataplane} Clean Up Linux
+ Wait Until Keyword Succeeds ${timeout} 2s Perform Sanity Test
*** Keywords ***
Setup Suite