Extending check for GPON asgvolt64 package/process
Change-Id: Ic6ff7d51deef0dbb218c3f92f105d11e7418c2ea
diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 91e2422..5fcd0c0 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -163,12 +163,16 @@
timeout(5) {
waitUntil {
olt_sw_present = sh returnStdout: true, script: """
- sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'dpkg --list | grep asfvolt16 | wc -l'
+ if [[ "${oltDebVersion}" == *"asfvolt16"* ]]; then
+ sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'dpkg --list | grep asfvolt16 | wc -l'
+ else
+ sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'dpkg --list | grep asgvolt64 | wc -l'
+ fi
if ( ${deployment_config.olts[i].fortygig} ); then
sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'echo "port ce128 sp=40000" >> /broadcom/qax.soc'
fi
"""
- return olt_sw_present.toInteger() == 1
+ return olt_sw_present.toInteger() > 0
}
}
}