Merge "Using test image and TP in voltha-scale-att"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 2fb494f..f72733d 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -97,6 +97,7 @@
config-pod: 'flex-ocp-cord'
release: '2.6'
branch: 'voltha-2.6'
+ disable-job: true
num-of-openonu: '1'
num-of-onos: '3'
num-of-atomix: '3'
@@ -112,15 +113,42 @@
config-pod: 'flex-ocp-cord'
release: '2.6'
branch: 'voltha-2.6'
+ disable-job: true
power-switch: True
test-repo: 'voltha-system-tests'
profile: '1T4GEM'
+ # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ release: '2.7'
+ branch: 'voltha-2.7'
+ num-of-openonu: '1'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ configurePod: true
+ profile: '1T4GEM'
+ time: '1'
+
+ # flex pod1 test job - released versions: uses tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ release: '2.7'
+ branch: 'voltha-2.7'
+ power-switch: True
+ test-repo: 'voltha-system-tests'
+ profile: '1T4GEM'
+
# flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
- 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
+ disable-job: true
release: '2.6'
branch: 'voltha-2.6'
num-of-openonu: '1'
@@ -138,6 +166,7 @@
- 'build_voltha_pod_test':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
+ disable-job: true
release: '2.6'
branch: 'voltha-2.6'
name-extension: '_TT'
@@ -147,6 +176,37 @@
test-repo: 'voltha-system-tests'
profile: 'TP'
+
+ # flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ release: '2.7'
+ branch: 'voltha-2.7'
+ num-of-openonu: '1'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ name-extension: '_TT'
+ work-flow: 'TT'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ configurePod: true
+ profile: 'TP'
+ time: '22'
+
+ # flex pod1 test job - released versions: uses tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'qa-testvm-pod'
+ config-pod: 'flex-ocp-cord'
+ release: '2.7'
+ branch: 'voltha-2.7'
+ name-extension: '_TT'
+ work-flow: 'TT'
+ power-switch: True
+ pipeline-script: 'voltha-tt-physical-functional-tests.groovy'
+ test-repo: 'voltha-system-tests'
+ profile: 'TP'
+
# flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
- 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
@@ -181,6 +241,7 @@
- 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord-openonupy'
+ disable-job: true
release: '2.6'
branch: 'voltha-2.6'
num-of-onos: '3'
@@ -196,6 +257,7 @@
- 'build_voltha_pod_test':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord-openonupy'
+ disable-job: true
name-extension: '_openonupy'
release: '2.6'
branch: 'voltha-2.6'
@@ -207,6 +269,7 @@
- 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord-openonupy'
+ disable-job: true
release: '2.6'
branch: 'voltha-2.6'
num-of-onos: '3'
@@ -224,6 +287,7 @@
- 'build_voltha_pod_test':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord-openonupy'
+ disable-job: true
name-extension: '_TT_openonupy'
release: '2.6'
branch: 'voltha-2.6'
@@ -297,6 +361,7 @@
- 'build_voltha_pod_release_timer':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
+ disable-job: true
release: '2.6'
branch: 'voltha-2.6'
name-extension: '_DT'
@@ -316,6 +381,7 @@
- 'build_voltha_pod_test':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
+ disable-job: true
release: '2.6'
branch: 'voltha-2.6'
name-extension: '_DT'
@@ -325,6 +391,39 @@
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
power-switch: 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'
+ release: '2.7'
+ branch: 'voltha-2.7'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ num-of-openonu: '1'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ configurePod: true
+ profile: '1T8GEM'
+ VolthaEtcdPort: '9999'
+ in-band-management: true
+ time: '7'
+
+ # Menlo pod test job - uses tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ release: '2.7'
+ branch: 'voltha-2.7'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ test-repo: 'voltha-system-tests'
+ profile: '1T8GEM'
+ pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
+ power-switch: True
+
# Menlo DEMO-POD - 1 1TCONT 4 4GEMs TechProfile - Manual build and test job
- 'build_pod_manual':
build-node: 'menlo-demo-pod'
@@ -407,6 +506,7 @@
- 'build_voltha_pod_soak_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
+ disable-job: true
profile: '1T8GEM'
branch: 'master'
release: 'master'
@@ -591,7 +691,6 @@
openoltAdapterChart: '/home/community/adtran-2021-01-29/voltha-adapter-adtran-olt'
time: '7'
-
# Berlin POD adtran test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
build-node: 'dt-berlin-community-pod'
@@ -606,10 +705,13 @@
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
+
+
+ # Berlin pod with gpon olt/onu - voltha-2.6 1T8GEM tech profile and timer based job
- 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
+ disable-job: true
release: '2.6'
branch: 'voltha-2.6'
num-of-openonu: '1'
@@ -624,14 +726,47 @@
time: '13'
- # Berlin POD test job - voltha-2.5 versions: uses 1T8GEM tech profile on voltha branch
+ # Berlin POD test job - voltha-2.6 versions: uses 1T8GEM tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon'
+ disable-job: true
+ name-extension: '_DT'
+ work-flow: 'DT'
+ release: '2.6'
+ branch: 'voltha-2.6'
+ test-repo: 'voltha-system-tests'
+ profile: '1T8GEM'
+ power-switch: True
+ pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
+
+
+ # Berlin pod with gpon olt/onu - released 1T8GEM tech profile and timer based job
+ - 'build_voltha_pod_release_timer':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon'
+ release: '2.7'
+ branch: 'voltha-2.7'
+ num-of-openonu: '1'
+ num-of-onos: '3'
+ num-of-atomix: '3'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ configurePod: true
+ profile: '1T8GEM'
+ time: '13'
+
+
+ # Berlin POD test job - released versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
name-extension: '_DT'
work-flow: 'DT'
- release: '2.6'
- branch: 'voltha-2.6'
+ release: '2.7'
+ branch: 'voltha-2.7'
test-repo: 'voltha-system-tests'
profile: '1T8GEM'
power-switch: True
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index d2f4b3c..41d86dd 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -51,7 +51,7 @@
time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-2.6-multiple-olts-test-bbsim'
+ name: 'periodic-voltha-2.7-multiple-olts-test-bbsim'
pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
build-node: 'qct-pod4-node2'
make-target: functional-multi-olt
@@ -60,7 +60,7 @@
make-target-alarmtest: bbsim-alarms-kind
make-target-multipleolt: bbsim-multiolt-kind
withAlarms: false
- code-branch: 'voltha-2.6'
+ code-branch: 'voltha-2.7'
olts: 2
onus: 2
pons: 2
@@ -101,16 +101,16 @@
time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-test-DMI-2.6'
+ name: 'periodic-voltha-test-DMI-2.7'
pipeline-script: 'voltha-DMI-bbsim-tests.groovy'
build-node: 'qct-pod4-node2'
make-target: bbsim-dmi-hw-management-test
withAlarms: false
- code-branch: 'voltha-2.6'
+ code-branch: 'voltha-2.7'
time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-test-bbsim-2.6'
+ name: 'periodic-voltha-test-bbsim-2.7'
pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
build-node: 'qct-pod4-node2'
make-target: functional-single-kind
@@ -118,7 +118,7 @@
make-target-errortest: bbsim-errorscenarios
make-target-alarmtest: bbsim-alarms-kind
withAlarms: true
- code-branch: 'voltha-2.6'
+ code-branch: 'voltha-2.7'
onus: 2
pons: 2
time-trigger: "H H/23 * * *"
@@ -134,10 +134,10 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-etcd-test-2.6'
+ name: 'periodic-voltha-etcd-test-2.7'
pipeline-script: 'voltha-system-test-bbsim.groovy'
build-node: 'ubuntu16.04-basebuild-4c-8g'
- code-branch: 'voltha-2.6'
+ code-branch: 'voltha-2.7'
make-target: sanity-multi-kind
onus: 2
pons: 2
@@ -156,10 +156,10 @@
time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-sanity-test-multi-runs-2.6'
+ name: 'periodic-voltha-sanity-test-multi-runs-2.7'
pipeline-script: 'voltha-go-multi-tests.groovy'
build-node: 'qct-pod4-node2'
- code-branch: 'voltha-2.6'
+ code-branch: 'voltha-2.7'
make-target: sanity-kind
onus: 1
pons: 1