Turn off the returnStdout flag so that we can see it in the console log
Change-Id: I20d9822f3d7cd92d9feb932cb69534026b433d75
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index 65e4ae2..6b05b59 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -47,7 +47,7 @@
stages {
stage ('Initialize') {
steps {
- sh returnStdout: true, script: """
+ sh returnStdout: false, script: """
test -e $WORKSPACE/kind-voltha/voltha && cd $WORKSPACE/kind-voltha && ./voltha down
cd $WORKSPACE
rm -rf $WORKSPACE/*
@@ -55,7 +55,7 @@
script {
if (env.configRepo && ! env.localConfigDir) {
env.localConfigDir = "$WORKSPACE"
- sh returnStdout: true, script: "git clone -b master ${cordRepoUrl}/${configRepo}"
+ sh returnStdout: false, script: "git clone -b master ${cordRepoUrl}/${configRepo}"
}
localDeploymentConfigFile = "${env.localConfigDir}/${params.deploymentConfigFile}"
localKindVolthaValuesFile = "${env.localConfigDir}/${params.kindVolthaValuesFile}"
@@ -217,21 +217,21 @@
steps {
script {
deployment_config.olts.each { olt ->
- sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service openolt stop' || true"
- sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'killall dev_mgmt_daemon' || true"
- sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --remove asfvolt16 && dpkg --purge asfvolt16'"
+ 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'"
return olt_sw_present.toInteger() == 0
}
- sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --install ${oltDebVersion}'"
+ sh returnStdout: false, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --install ${oltDebVersion}'"
waitUntil {
olt_sw_present = sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --list | grep asfvolt16 | wc -l'"
return olt_sw_present.toInteger() == 1
}
if ( olt.fortygig ) {
// If the OLT is connected to a 40G switch interface, set the NNI port to be downgraded
- sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'echo port ce128 sp=40000 >> /broadcom/qax.soc ; /opt/bcm68620/svk_init.sh'"
+ sh returnStdout: false, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'echo port ce128 sp=40000 >> /broadcom/qax.soc ; /opt/bcm68620/svk_init.sh'"
}
}
}
@@ -242,7 +242,7 @@
steps {
script {
deployment_config.olts.each { olt ->
- sh returnStdout: true, script: """
+ 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
@@ -280,7 +280,7 @@
post {
always {
- sh returnStdout: true, script: """
+ sh returnStdout: false, script: """
set +e
cp kind-voltha/install-minimal.log $WORKSPACE/
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
@@ -310,7 +310,7 @@
"""
script {
deployment_config.olts.each { olt ->
- sh returnStdout: true, script: """
+ 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
"""
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index aa9a782..dea31dd 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -36,7 +36,7 @@
stage ('Initialize') {
steps {
step([$class: 'WsCleanup'])
- sh returnStdout: true, script: "git clone -b ${branch} ${cordRepoUrl}/${configBaseDir}"
+ sh returnStdout: false, script: "git clone -b ${branch} ${cordRepoUrl}/${configBaseDir}"
script {
deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
}
@@ -54,7 +54,7 @@
jobs: 4,
showAllChanges: true]
)
- sh returnStdout: true, script: """
+ sh returnStdout: false, script: """
cd voltha
git clone -b ${branch} ${cordRepoUrl}/cord-tester
git clone -b ${branch} ${cordRepoUrl}/voltha # NOTE do we need the voltha source code??
@@ -78,7 +78,7 @@
post {
always {
- sh returnStdout: true, script: """
+ sh returnStdout: false, script: """
set +e
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.image}{'\\t'}{.imageID}{'\\n'}" | sort | uniq -c
kubectl get nodes -o wide
@@ -104,7 +104,7 @@
"""
script {
deployment_config.olts.each { olt ->
- sh returnStdout: true, script: """
+ 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
"""