Allowing for empty deb version for ADTRAN OLT
Also avoiding logging if OLT does not provide usr/pwd
Change-Id: I1b895bb1350c8865129e76909db040606c9d3ce0
diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index c92d522..5f2c5cc 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -176,7 +176,8 @@
stage('Push Tech-Profile') {
for(int i=0; i < deployment_config.olts.size(); i++) {
def tech_prof_directory = "XGS-PON"
- if (deployment_config.olts[i].oltDebVersion.contains("asgvolt64")){
+ // If no debian package is specified we default to GPON for the ADTRAN OLT.
+ if (!deployment_config.olts[i].containsKey("oltDebVersion") || deployment_config.olts[i].oltDebVersion.contains("asgvolt64")){
tech_prof_directory = "GPON"
}
timeout(1) {
diff --git a/libraries/utils.robot b/libraries/utils.robot
index dbd8b7b..139bb26 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -923,6 +923,8 @@
${olt_user} Evaluate ${olts}[${I}].get("user")
${olt_pass} Evaluate ${olts}[${I}].get("pass")
${olt_ssh_ip} Evaluate ${olts}[${I}].get("sship")
+ Continue For Loop If "${olt_user}" == "${None}"
+ Continue For Loop If "${olt_pass}" == "${None}"
Wait Until Keyword Succeeds 180s 10s Execute Remote Command
... printf '%s\n' '' '' '${message}' '' >> /var/log/openolt.log
... ${olt_ssh_ip} ${olt_user} ${olt_pass}