Merge "[VOL-5094] - Fix periodic-voltha-memory-leak-test-bbsim"
diff --git a/jjb/voltha-test/voltha-release-jobs/master.yaml b/jjb/voltha-test/voltha-release-jobs/master.yaml
index 880bdef..c42b1d1 100644
--- a/jjb/voltha-test/voltha-release-jobs/master.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/master.yaml
@@ -53,5 +53,27 @@
num-of-onos: '3'
num-of-atomix: '3'
pipeline-script: 'voltha/master/physical-build.groovy'
-
+
+ # -----------------------------------------------------------------------
+ # Menlo pod with olt/onu - master branch, Default tech profile and timer based job
+ # md5sum(master): f94fd1f2d15674629cb0900bb3b6c08a
+ # -----------------------------------------------------------------------
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+# branch: 'master'
+# release: 'master'
+ disable-job: true # menlo-demo-pod offline
+ name-extension: '_DT'
+ work-flow: 'DT'
+ profile: '1T8GEM'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ VolthaEtcdPort: 9999
+ in-band-management: true
+ waitTimerForOltUp: 540
+ time: '6'
+# Was not mentioned in voltha.yaml for branch=master ?!?
+# pipeline-script: 'voltha/master/physical-build.groovy'
+
# [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 ba0a8cd..6bf7b57 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.11.yaml
@@ -70,4 +70,24 @@
num-of-atomix: '3'
pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+ # -----------------------------------------------------------------------
+ # Menlo pod with olt/onu - released branch, Default tech profile and timer based job
+ # md5sum(master): f94fd1f2d15674629cb0900bb3b6c08a
+ # -----------------------------------------------------------------------
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ disable-job: true # menlo-demo-pod offline
+ release: '2.11'
+ branch: 'voltha-2.11'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ profile: '1T8GEM'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ VolthaEtcdPort: 9999
+ in-band-management: true
+ time: '11'
+ pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
+
# [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 9e059fa..287bec0 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.12.yaml
@@ -73,5 +73,25 @@
num-of-onos: '3'
num-of-atomix: '3'
pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
-
+
+ # -----------------------------------------------------------------------
+ # Menlo pod with olt/onu - released branch, Default tech profile and timer based job
+ # md5sum(master): f94fd1f2d15674629cb0900bb3b6c08a
+ # -----------------------------------------------------------------------
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ disable-job: true # menlo-demo-pod offline
+ release: '2.12'
+ branch: 'voltha-2.12'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ profile: '1T8GEM'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ VolthaEtcdPort: 9999
+ in-band-management: true
+ time: '11'
+ pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
+
# [EOF]
diff --git a/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml b/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
index f8be906..39e5308 100644
--- a/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
+++ b/jjb/voltha-test/voltha-release-jobs/voltha-2.8.yaml
@@ -72,5 +72,23 @@
num-of-onos: '3'
num-of-atomix: '3'
pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+
+ # -----------------------------------------------------------------------
+ # Menlo pod with olt/onu - released branch, Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ disable-job: true
+ release: '2.8'
+ branch: 'voltha-2.8'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ profile: '1T8GEM'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ VolthaEtcdPort: 9999
+ in-band-management: true
+ time: '11'
+ pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
# [EOF]
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 81e419c..b866911 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -228,21 +228,6 @@
power-switch: true
power-cycle-olt: true
- # Menlo pod with olt/onu - master branch, Default tech profile and timer based job
- - 'build_voltha_pod_release_timer':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- disable-job: false
- name-extension: '_DT'
- work-flow: 'DT'
- profile: '1T8GEM'
- num-of-onos: '3'
- num-of-atomix: '3'
- VolthaEtcdPort: 9999
- in-band-management: true
- waitTimerForOltUp: 540
- time: '6'
-
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
timeout: 330
@@ -260,58 +245,6 @@
power-cycle-olt: true
# -----------------------------------------------------------------------
- # Menlo pod with olt/onu - released branch, Default tech profile and timer based job
-# - 'build_voltha_pod_release_timer':
-# build-node: 'menlo-demo-pod'
-# config-pod: 'onf-demo-pod'
-# disable-job: true
-# release: '2.8'
-# branch: 'voltha-2.8'
-# name-extension: '_DT'
-# work-flow: 'DT'
-# profile: '1T8GEM'
-# num-of-onos: '3'
-# num-of-atomix: '3'
-# VolthaEtcdPort: 9999
-# in-band-management: true
-# time: '11'
-# pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-
- # Menlo pod with olt/onu - released branch, Default tech profile and timer based job
- - 'build_voltha_pod_release_timer':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- disable-job: false
- release: '2.11'
- branch: 'voltha-2.11'
- name-extension: '_DT'
- work-flow: 'DT'
- profile: '1T8GEM'
- num-of-onos: '3'
- num-of-atomix: '3'
- VolthaEtcdPort: 9999
- in-band-management: true
- time: '11'
- pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
-
- # Menlo pod with olt/onu - released branch, Default tech profile and timer based job
- - 'build_voltha_pod_release_timer':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
- disable-job: false
- release: '2.12'
- branch: 'voltha-2.12'
- name-extension: '_DT'
- work-flow: 'DT'
- profile: '1T8GEM'
- num-of-onos: '3'
- num-of-atomix: '3'
- VolthaEtcdPort: 9999
- in-band-management: true
- time: '11'
- pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
-
- # -----------------------------------------------------------------------
# Menlo pod test job - uses tech profile on voltha branch
# - 'build_voltha_pod_test':
# timeout: 300