Merge "Added voltha-2.9 physical pod pipeline support and onf-demo-pod_1T4GEM_voltha_2.9 job"
diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 28241f8..51313a6 100644
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -322,10 +322,18 @@
timeout(5) {
waitUntil {
olt_sw_present = sh returnStdout: true, script: """
- if [ "${deployment_config.olts[i].oltDebVersion}" == *"asfvolt16"* ]; then
+ if [[ "${deployment_config.olts[i].oltDebVersion}" == *"asfvolt16"* ]]; then
sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep asfvolt16 | wc -l'
- else
+ elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"asgvolt64"* ]]; then
sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep asgvolt64 | wc -l'
+ elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"rlt-1600x-w"* ]]; then
+ sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-1600x-w | wc -l'
+ elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"rlt-1600g-w"* ]]; then
+ sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-1600g-w | wc -l'
+ elif [[ "${deployment_config.olts[i].oltDebVersion}" == *"rlt-3200g-w"* ]]; then
+ sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'dpkg --list | grep rlt-3200g-w | wc -l'
+ else
+ echo Unknown Debian package for openolt
fi
if (${deployment_config.olts[i].fortygig}); then
if [[ "${params.inBandManagement}" == "true" ]]; then
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index 78e9c93..12358db 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -31,12 +31,12 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-1600g'
disable-job: true
- reinstall-olt: false
+ reinstall-olt: true
name-extension: '_DT'
work-flow: 'DT'
profile: '1T8GEM'
time: '21'
- extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
+ extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
# Certification (Radisys 1600G) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -58,12 +58,12 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-1600x'
disable-job: false
- reinstall-olt: false
+ reinstall-olt: true
name-extension: '_DT'
work-flow: 'DT'
profile: '1T8GEM'
time: '1'
- extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
+ extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
# Certification (Radisys 1600X) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -85,12 +85,12 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-3200g'
disable-job: false
- reinstall-olt: false
+ reinstall-olt: true
name-extension: '_DT'
work-flow: 'DT'
profile: '1T8GEM'
time: '5'
- extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
+ extraHelmFlags: "--set onos-classic.image.tag=master --set voltha.global.rw_core.rpc_timeout=30s --set voltha.global.rw_core.internal_timeout=30s"
# Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -112,7 +112,7 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-3200g'
disable-job: false
- reinstall-olt: false
+ reinstall-olt: true
release: '2.8'
branch: 'voltha-2.8'
name-extension: '_DT'
@@ -120,7 +120,7 @@
profile: '1T8GEM'
time: '9'
pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
- extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+ extraHelmFlags: "--set onos-classic.image.tag=master"
# Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -141,7 +141,7 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-1600g'
disable-job: false
- reinstall-olt: false
+ reinstall-olt: true
release: '2.8'
branch: 'voltha-2.8'
name-extension: '_DT'
@@ -149,7 +149,7 @@
profile: '1T8GEM'
time: '13'
pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
- extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+ extraHelmFlags: "--set onos-classic.image.tag=master"
# Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -170,7 +170,7 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-1600x'
disable-job: false
- reinstall-olt: false
+ reinstall-olt: true
release: '2.8'
branch: 'voltha-2.8'
name-extension: '_DT'
@@ -178,7 +178,7 @@
profile: '1T8GEM'
time: '17'
pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
- extraHelmFlags: "--set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+ extraHelmFlags: "--set onos-classic.image.tag=master"
# Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -199,7 +199,7 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-3200g'
disable-job: true
- reinstall-olt: false
+ reinstall-olt: true
work-flow: 'ATT'
profile: '1T4GEM'
time: '13'
@@ -222,7 +222,7 @@
build-node: 'menlo-certification-pod'
config-pod: 'menlo-certification-pod-radisys-3200g'
disable-job: true
- reinstall-olt: false
+ reinstall-olt: true
work-flow: 'ATT'
profile: '1T4GEM-unencrypted'
time: '17'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 891785d..87c55b3 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -438,7 +438,7 @@
profile: '1T8GEM'
num-of-onos: '3'
num-of-atomix: '3'
- time: '16'
+ time: '1'
# Berlin POD test job - master versions: uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -463,7 +463,7 @@
profile: '1T8GEM'
num-of-onos: '3'
num-of-atomix: '3'
- time: '1'
+ time: '7'
# Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -490,7 +490,9 @@
profile: '1T8GEM'
num-of-onos: '3'
num-of-atomix: '3'
- time: '11'
+ # Update time trigger value while re-enabling the job
+ time: ''
+ 'disable-job': true
pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
# Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -504,6 +506,7 @@
test-repo: 'voltha-system-tests'
profile: '1T8GEM'
power-switch: True
+ 'disable-job': true
pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
# Berlin pod with olt/onu - voltha-2.8 versions timer based job , two OLTs
@@ -518,7 +521,7 @@
num-of-onos: '3'
num-of-atomix: '3'
pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
- time: '5'
+ time: '13'
# Berlin POD test job - voltha-2.8 versions: uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -543,7 +546,7 @@
branch: 'voltha-2.8'
profile: '1T8GEM'
reinstall-olt: false
- extraHelmFlags: "--set adapter_adtran_olt.kv_store_data_prefix='service/voltha/voltha_voltha' --set network.netconfUserSecret='' --set adapter_adtran_olt.topics.core_topic=voltha_voltha_rwcore --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=meter-fixes-simple"
+ extraHelmFlags: "--set adapter_adtran_olt.kv_store_data_prefix='service/voltha/voltha_voltha' --set network.netconfUserSecret='' --set adapter_adtran_olt.topics.core_topic=voltha_voltha_rwcore --set onos-classic.image.tag=master"
num-of-onos: '3'
num-of-atomix: '3'
pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
@@ -551,7 +554,7 @@
openoltAdapterChart: '/home/community/adtran-21.5-voltha-2.8/voltha-adapter-adtran-olt'
oltAdapterReleaseName: 'adtran-olt'
waitTimerForOltUp: 420
- time: '21'
+ time: '19'
# Berlin POD adtran test job - 2.8 versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':