Merge "[VOL-3780] Migrating voltha-scale multi-stack pipeline to helm-charts"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 2f6e4ad..9aeda20 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -387,32 +387,6 @@
Jenkinsfile: 'Jenkinsfile-voltha-test'
- # Soak pod with xgs-pon olt/onu - master 1T4GEM tech profile and openonu go and timer based job
- - 'build_voltha_pod_release_timer':
- build-node: 'menlo-soak-pod'
- config-pod: 'onf-soak-pod-openonugo'
- 'disable-job': true
- release: 'master'
- branch: 'master'
- name-extension: '_openonugo'
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-build'
- configurePod: true
- profile: '1T4GEM'
- time: '1'
-
-
- # Soak POD test job - master versions, uses 1T4GEM tech profile and openonu go on voltha branch
- - 'build_voltha_pod_test':
- build-node: 'menlo-soak-pod'
- config-pod: 'onf-soak-pod-openonugo'
- 'disable-job': true
- name-extension: '_openonugo'
- release: 'master'
- branch: 'master'
- test-repo: 'voltha-system-tests'
- profile: '1T4GEM'
-
# Menlo pod with olt/onu - Default tech profile and timer based job
# ONF Menlo Soak POD build job - voltha-master branch
# FIXME once the soak-pod is back use 'build_voltha_pod_release_timer'
@@ -420,6 +394,7 @@
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
release: 'master'
+ installBBSim: true
branch: 'master'
profile: '1T8GEM'
test-repo: 'voltha-system-tests'
@@ -447,7 +422,6 @@
- 'build_voltha_pod_soak_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
- 'disable-job': true
profile: '1T8GEM'
branch: 'master'
release: 'master'
@@ -463,7 +437,6 @@
- 'build_voltha_pod_soak_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
- 'disable-job': true
profile: '1T8GEM'
branch: 'master'
release: 'master'
@@ -479,7 +452,6 @@
- 'build_voltha_pod_soak_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
- 'disable-job': true
profile: '1T8GEM'
branch: 'master'
release: 'master'
@@ -505,7 +477,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '1'
+ time: '20'
# Berlin POD test job - master versions: uses tech profile on voltha branch
@@ -522,7 +494,7 @@
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
# Berlin pod with olt/onu - voltha-2.6 timer based job , two OLTs
- - 'build_voltha_pod_release_dependent':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-multi-olt'
release: '2.6'
@@ -536,7 +508,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- trigger-after: build_dt-berlin-pod-multi-olt_1T8GEM_voltha_DT_master_test
+ time: '1'
# Berlin POD test job - voltha-2.6 versions: two OLTs
@@ -553,7 +525,7 @@
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
# Berlin pod with olt/onu - voltha-2.6 Default tech profile and timer based job
- - 'build_voltha_pod_release_dependent':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod'
release: '2.6'
@@ -566,7 +538,8 @@
configurePod: true
disable-job: true
profile: 'Default'
- trigger-after: build_dt-berlin-pod-multi-olt_1T8GEM_voltha_DT_2.6_test
+ # Update this value accordingly once the job is enabled
+ time: ''
# Berlin POD test job - master versions: uses tech profile on voltha branch
@@ -580,7 +553,7 @@
power-switch: True
# Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
- - 'build_voltha_pod_release_dependent':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
release: 'master'
@@ -594,8 +567,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- #update this to use 'build_dt-berlin-pod_Default_voltha_2.6_test' once above job enables
- trigger-after: build_dt-berlin-pod-multi-olt_1T8GEM_voltha_DT_2.6_test
+ time: '6'
# Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -612,7 +584,7 @@
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
# Berlin pod with adtran gpon olt/onu - master 1T8GEM tech profile and timer based job
- - 'build_voltha_pod_release_dependent':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon-adtran'
release: '2.6'
@@ -628,7 +600,7 @@
profile: '1T8GEM'
reinstall-olt: false
openoltAdapterChart: '/home/community/adtran-2021-01-29/voltha-adapter-adtran-olt'
- trigger-after: build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_master_test
+ time: '11'
# Berlin POD adtran test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -641,12 +613,12 @@
branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
profile: '1T8GEM'
- power-switch: False
+ power-switch: True
oltAdapterAppLabel: 'adapter-adtran-olt'
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
# Berlin pod with gpon olt/onu - voltha-2.5 1T8GEM tech profile and timer based job
- - 'build_voltha_pod_release_dependent':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
release: '2.6'
@@ -660,7 +632,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- trigger-after: build_dt-berlin-pod-gpon-adtran_1T8GEM_voltha_DT_2.6_test
+ time: '16'
# Berlin POD test job - voltha-2.5 versions: uses 1T8GEM tech profile on voltha branch
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index a3f7083..f07a112 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -23,7 +23,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 340, unit: 'MINUTES')
+ timeout(time: 640, unit: 'MINUTES')
}
environment {
@@ -66,6 +66,14 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ script {
+ sh(script:"""
+ if [ '${volthaSystemTestsChange}' != '' ] ; then
+ cd $WORKSPACE/voltha-system-tests;
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+ fi
+ """)
+ }
}
}
stage('Clone cord-tester') {
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index 7370d07..5fb1278 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -84,6 +84,14 @@
[$class: 'CloneOption', depth: 0, noTags: false, reference: '', shallow: false],
],
])
+ script {
+ sh(script:"""
+ if [ '${volthaSystemTestsChange}' != '' ] ; then
+ cd $WORKSPACE/voltha-system-tests;
+ git fetch https://gerrit.opencord.org/voltha-system-tests ${volthaSystemTestsChange} && git checkout FETCH_HEAD
+ fi
+ """)
+ }
}
}
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 4b3b761..1f1f102 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -220,12 +220,6 @@
- reverse:
jobs: '{trigger-after}'
result: 'success'
- - reverse:
- jobs: '{trigger-after}'
- result: 'failure'
- - reverse:
- jobs: '{trigger-after}'
- result: 'unstable'
# VOLTHA Test Job
# This job is automatically triggered after a build job has successfully completed