Merge "Set Maven profile in verify jobs to catch potential release errors"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index e7062dc..2a488e1 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -130,7 +130,7 @@
released: false
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt-2.2.deb'
+ oltDebVersion: 'openolt_asfvolt16.deb'
configurePod: true
profile: 'Default'
time: '1'
@@ -153,7 +153,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt-2.2.deb'
+ oltDebVersion: 'openolt_asfvolt16.deb'
configurePod: true
profile: '1T4GEM'
- 'build_pod_test':
@@ -172,7 +172,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt-2.2.deb'
+ oltDebVersion: 'openolt_asfvolt16.deb'
configurePod: true
profile: 'Default'
diff --git a/jjb/pipeline/voltha-physical-tests.groovy b/jjb/pipeline/voltha-physical-tests.groovy
index 85d1f0f..44dfd26 100644
--- a/jjb/pipeline/voltha-physical-tests.groovy
+++ b/jjb/pipeline/voltha-physical-tests.groovy
@@ -219,8 +219,8 @@
steps {
script {
deployment_config.olts.each { olt ->
- sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service bal_core_dist stop' || true"
- sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service bal_core_dist stop' || true"
+ 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'"
waitUntil {
olt_sw_present = sh returnStdout: true, script: "sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'dpkg --list | grep asfvolt16 | wc -l'"
@@ -246,10 +246,10 @@
deployment_config.olts.each { olt ->
sh returnStdout: true, script: """
ssh-keyscan -H ${olt.ip} >> ~/.ssh/known_hosts
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service bal_core_dist stop' || true
sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service openolt stop' || true
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'rm -f /var/log/bal_core_dist.log /var/log/openolt.log'
- sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service bal_core_dist start &'
+ 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} 'service dev_mgmt_daemon start &'
sleep 5
sshpass -p ${olt.pass} ssh -l ${olt.user} ${olt.ip} 'service openolt start &'
"""
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index b9eba3f..5f30bff 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -32,7 +32,7 @@
config-pod: 'tucson-pod'
branch: 'master'
pipeline-script: 'voltha-physical-tests.groovy'
- oltDebVersion: 'openolt-seba-2.0.deb'
+ oltDebVersion: 'openolt_asfvolt16.deb'
profile: 'Default'
withPatchset: true
@@ -44,7 +44,7 @@
config-pod: 'tucson-pod'
branch: 'master'
pipeline-script: 'voltha-physical-tests.groovy'
- oltDebVersion: 'openolt-seba-2.0.deb'
+ oltDebVersion: 'openolt_asfvolt16.deb'
profile: 'Default'
withPatchset: false