Changing Jobs on ONF Demo POD to be trigger one after the other
Change-Id: I49d4517ebb419eaeae5aa1ce3c159b56a48d53fc
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index cad57d9..2a02e34 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -60,7 +60,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-test'
# flex OCP pod with olt/onu - Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
release: 'master'
@@ -85,7 +85,7 @@
profile: 'Default'
# flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
release: '2.4'
@@ -110,7 +110,7 @@
profile: '1T4GEM'
# flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
release: '2.4'
@@ -140,7 +140,7 @@
profile: 'TP'
# flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
release: 'master'
@@ -169,8 +169,36 @@
test-repo: 'voltha-system-tests'
profile: 'TP'
+ # Menlo pod with olt/onu - Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod-gpon'
+ release: 'master'
+ branch: 'master'
+ num-of-openonu: '2'
+ name-extension: '_DT_GPON'
+ work-flow: 'DT'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ configurePod: true
+ profile: '1T8GEM'
+ time: '22'
+ VolthaEtcdPort: '9999'
+
+ # Menlo pod test job - uses tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod-gpon'
+ release: 'master'
+ branch: 'master'
+ name-extension: '_DT_GPON'
+ work-flow: 'DT'
+ test-repo: 'voltha-system-tests'
+ profile: '1T8GEM'
+ pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
+
# Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_dependent':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
release: 'master'
@@ -182,10 +210,10 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T4GEM'
- time: '1'
in-band-management: true
VolthaEtcdPort: '9999'
reinstall-olt: false
+ trigger-after: build_onf-demo-pod_Default_voltha_2.4
# Menlo pod test job - master test job uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -198,7 +226,7 @@
power-switch: True
# Menlo pod with olt/onu - master branch, Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_dependent':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
release: 'master'
@@ -210,10 +238,10 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '4'
VolthaEtcdPort: '9999'
in-band-management: true
reinstall-olt: false
+ trigger-after: build_onf-demo-pod_1T4GEM_voltha_master
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -230,7 +258,7 @@
# Menlo pod with olt/onu - voltha-2.4 branch, Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_dependent':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
release: '2.4'
@@ -244,10 +272,10 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '7'
VolthaEtcdPort: '9999'
reinstall-olt: false
in-band-management: true
+ trigger-after: build_onf-demo-pod_1T8GEM_DT_voltha_master
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -262,35 +290,6 @@
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
power-switch: True
- # Menlo pod with olt/onu - master branch, 1T8GEM tech profile and timer based job
- - 'build_voltha_pod_release':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod-gpon'
- release: 'master'
- branch: 'master'
- num-of-openonu: '2'
- name-extension: '_DT_GPON'
- work-flow: 'DT'
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-build'
- configurePod: true
- profile: '1T8GEM'
- time: '22'
- VolthaEtcdPort: '9999'
-
- # Menlo pod test job - uses 1T8GEM tech profile on master voltha branch
- - 'build_voltha_pod_test':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod-gpon'
- release: 'master'
- branch: 'master'
- name-extension: '_DT_GPON'
- work-flow: 'DT'
- test-repo: 'voltha-system-tests'
- profile: '1T8GEM'
- pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
-
-
# Menlo DEMO-POD - 1 1TCONT 4 4GEMs TechProfile - Manual build and test job
- 'build_pod_manual':
build-node: 'menlo-demo-pod'
@@ -340,6 +339,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-test'
# ONF Menlo Soak POD build job - voltha-master branch
+ # FIXME once the soak-pod is back use 'build_voltha_pod_release_timer'
- 'build_pod_manual':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
@@ -351,6 +351,7 @@
profile: 'Default'
# ONF Menlo Soak POD test job - voltha-master branch
+ # FIXME once the soak-pod is back use 'build_voltha_pod_test'
- 'build_pod_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
@@ -360,7 +361,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-test'
# Infosys pod with olt/onu - Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'infosys-test-pod'
config-pod: 'infosys-pod'
release: 'master'
@@ -381,7 +382,7 @@
profile: 'Default'
# Infosys pod with olt/onu - voltha-2.4 Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'infosys-test-pod'
config-pod: 'infosys-pod'
release: '2.4'
@@ -422,7 +423,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-test'
# Berlin pod with olt/onu - master versions Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod'
release: 'master'
@@ -449,7 +450,7 @@
power-switch: True
# Berlin pod with olt/onu - voltha-2.4 Default tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod'
release: '2.4'
@@ -476,7 +477,7 @@
power-switch: True
# Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
release: 'master'
@@ -508,7 +509,7 @@
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
# Berlin pod with gpon olt/onu - voltha-2.4 1T8GEM tech profile and timer based job
- - 'build_voltha_pod_release':
+ - 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
release: '2.4'