Merge "VOL-5153 - Disable job build_onf-demo-pod_1T4GEM_voltha_*"
diff --git a/jjb/voltha-test/voltha-release-jobs/master.yaml b/jjb/voltha-test/voltha-release-jobs/master.yaml
index c42b1d1..8c461ae 100644
--- a/jjb/voltha-test/voltha-release-jobs/master.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/master.yaml
@@ -75,5 +75,23 @@
time: '6'
# Was not mentioned in voltha.yaml for branch=master ?!?
# pipeline-script: 'voltha/master/physical-build.groovy'
-
+
+ # -----------------------------------------------------------------------
+ # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
+ # md5sum(master): 68a2922b69b3b7f83a599ae6fb7abb1c
+ # -----------------------------------------------------------------------
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ disable-job: true # Reason: onf-demo-pod offline
+ release: 'master'
+ branch: 'master'
+ profile: '1T4GEM'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ in-band-management: true
+ waitTimerForOltUp: 540
+ VolthaEtcdPort: 9999
+ time: '1'
+
# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
index 6bf7b57..c5d609d 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
@@ -89,5 +89,23 @@
in-band-management: true
time: '11'
pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
+ # -----------------------------------------------------------------------
+ # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
+ # md5sum(master): 68a2922b69b3b7f83a599ae6fb7abb1c
+ # -----------------------------------------------------------------------
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ disable-job: true # Reason: onf-demo-pod offline
+ release: '2.11'
+ branch: 'voltha-2.11'
+ profile: '1T4GEM'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ in-band-management: true
+ waitTimerForOltUp: 540
+ VolthaEtcdPort: 9999
+ time: '1'
# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
index 287bec0..0952a9c 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
@@ -94,4 +94,22 @@
time: '11'
pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+ # -----------------------------------------------------------------------
+ # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
+ # md5sum(master): 68a2922b69b3b7f83a599ae6fb7abb1c
+ # -----------------------------------------------------------------------
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ disable-job: true # Reason: onf-demo-pod offline
+ release: '2.12'
+ branch: 'voltha-2.12'
+ profile: '1T4GEM'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ in-band-management: true
+ waitTimerForOltUp: 540
+ VolthaEtcdPort: 9999
+ time: '1'
+
# [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index b866911..0e58156 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -202,32 +202,6 @@
profile: 'TP'
enableMultiUni: true
- # Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
- - 'build_voltha_pod_release_timer':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- disable-job: false
- profile: '1T4GEM'
- num-of-onos: '3'
- num-of-atomix: '3'
- in-band-management: true
- waitTimerForOltUp: 540
- VolthaEtcdPort: 9999
- time: '1'
-
- # Menlo pod test job - master test job uses tech profile on voltha branch
- - 'build_voltha_pod_test':
- timeout: 300
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- disable-job: false
- release: 'master'
- branch: 'master'
- test-repo: 'voltha-system-tests'
- profile: '1T4GEM'
- power-switch: true
- power-cycle-olt: true
-
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
timeout: 330