Merge "Unsetting VOLTHA_API_PORT between stack deployment otherwise they'll be forwarded on the same port"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index f122874..c185076 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -92,35 +92,8 @@
- 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
- 'disable-job': true
- release: '2.4'
- branch: 'voltha-2.4'
- num-of-openonu: '2'
- 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'
- 'disable-job': true
- release: '2.4'
- branch: 'voltha-2.4'
- 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.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
num-of-openonu: '2'
num-of-onos: '3'
num-of-atomix: '3'
@@ -135,19 +108,19 @@
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
'disable-job': false
- release: '2.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
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.4'
- branch: 'voltha-2.4'
+ release: '2.6'
+ branch: 'voltha-2.6'
num-of-openonu: '2'
num-of-onos: '3'
num-of-atomix: '3'
@@ -163,39 +136,8 @@
- 'build_voltha_pod_test':
build-node: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
- 'disable-job': true
- release: '2.4'
- branch: 'voltha-2.4'
- 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'
- config-pod: 'flex-ocp-cord'
- release: '2.5'
- branch: 'voltha-2.5'
- num-of-openonu: '2'
- 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.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
name-extension: '_TT'
work-flow: 'TT'
power-switch: True
@@ -237,12 +179,12 @@
# Flex pod with xgs-pon olt/onu - master 1T4GEM tech profile and openonu go and timer based job
- 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord-openonugo'
- release: 'master'
- branch: 'master'
+ config-pod: 'flex-ocp-cord-openonupy'
+ release: '2.6'
+ branch: 'voltha-2.6'
num-of-onos: '3'
num-of-atomix: '3'
- name-extension: '_openonugo'
+ name-extension: '_openonupy'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
@@ -253,10 +195,10 @@
# Flex POD test job - master versions, uses 1T4GEM tech profile and openonu go on voltha branch
- 'build_voltha_pod_test':
build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord-openonugo'
- name-extension: '_openonugo'
- release: 'master'
- branch: 'master'
+ config-pod: 'flex-ocp-cord-openonupy'
+ name-extension: '_openonupy'
+ release: '2.6'
+ branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
profile: '1T4GEM'
power-switch: True
@@ -264,12 +206,12 @@
# Flex pod with xgs-pon olt/onu - master TT workflow openonu go and timer based job
- 'build_voltha_pod_release_timer':
build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord-openonugo'
- release: 'master'
- branch: 'master'
+ config-pod: 'flex-ocp-cord-openonupy'
+ release: '2.6'
+ branch: 'voltha-2.6'
num-of-onos: '3'
num-of-atomix: '3'
- name-extension: '_TT_openonugo'
+ name-extension: '_TT_openonupy'
work-flow: 'TT'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
@@ -281,10 +223,10 @@
# Flex POD test job - master versions, TT workflow and openonu go on voltha branch
- 'build_voltha_pod_test':
build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord-openonugo'
- name-extension: '_TT_openonugo'
- release: 'master'
- branch: 'master'
+ config-pod: 'flex-ocp-cord-openonupy'
+ name-extension: '_TT_openonupy'
+ release: '2.6'
+ branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
work-flow: 'TT'
pipeline-script: 'voltha-tt-physical-functional-tests.groovy'
@@ -381,46 +323,12 @@
power-switch: True
- # Menlo pod with olt/onu - voltha-2.4 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.4'
- branch: 'voltha-2.4'
- name-extension: '_DT'
- work-flow: 'DT'
- num-of-openonu: '2'
- 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'
- 'disable-job': true
- release: '2.4'
- branch: 'voltha-2.4'
- 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 pod with olt/onu - voltha-2.5 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.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
name-extension: '_DT'
work-flow: 'DT'
num-of-openonu: '2'
@@ -438,8 +346,8 @@
- 'build_voltha_pod_test':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
- release: '2.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
name-extension: '_DT'
work-flow: 'DT'
test-repo: 'voltha-system-tests'
@@ -498,6 +406,7 @@
- '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'
@@ -512,6 +421,7 @@
- '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'
@@ -618,8 +528,8 @@
- 'build_voltha_pod_release_timer':
build-node: 'infosys-test-pod'
config-pod: 'infosys-pod'
- release: '2.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
@@ -630,8 +540,8 @@
- 'build_voltha_pod_test':
build-node: 'infosys-test-pod'
config-pod: 'infosys-pod'
- release: '2.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
profile: 'Default'
@@ -690,8 +600,8 @@
- 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod'
- release: '2.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
num-of-openonu: '2'
num-of-onos: '3'
num-of-atomix: '3'
@@ -706,36 +616,8 @@
- 'build_voltha_pod_test':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod'
- release: '2.5'
- branch: 'voltha-2.5'
- test-repo: 'voltha-system-tests'
- profile: 'Default'
- power-switch: True
-
- # Berlin pod with olt/onu - voltha-2.4 Default tech profile and timer based job
- - 'build_voltha_pod_release_timer':
- build-node: 'dt-berlin-community-pod'
- config-pod: 'dt-berlin-pod'
- 'disable-job': true
- release: '2.4'
- branch: 'voltha-2.4'
- num-of-openonu: '2'
- num-of-onos: '3'
- num-of-atomix: '3'
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-build'
- configurePod: true
- profile: 'Default'
- time: '21'
-
-
- # Berlin POD test job - master versions: uses tech profile on voltha branch
- - 'build_voltha_pod_test':
- build-node: 'dt-berlin-community-pod'
- config-pod: 'dt-berlin-pod'
- 'disable-job': true
- release: '2.4'
- branch: 'voltha-2.4'
+ release: '2.6'
+ branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
profile: 'Default'
power-switch: True
@@ -775,8 +657,8 @@
- 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
- release: '2.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
num-of-openonu: '2'
num-of-onos: '3'
num-of-atomix: '3'
@@ -795,8 +677,8 @@
config-pod: 'dt-berlin-pod-gpon'
name-extension: '_DT'
work-flow: 'DT'
- release: '2.5'
- branch: 'voltha-2.5'
+ release: '2.6'
+ branch: 'voltha-2.6'
test-repo: 'voltha-system-tests'
profile: '1T8GEM'
power-switch: True
@@ -806,6 +688,7 @@
- 'build_voltha_pod_release_timer':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-openonugo'
+ 'disable-job': true
release: 'master'
branch: 'master'
num-of-onos: '3'
@@ -823,6 +706,7 @@
- 'build_voltha_pod_test':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-openonugo'
+ 'disable-job': true
name-extension: '_DT_openonugo'
work-flow: 'DT'
release: 'master'
@@ -832,39 +716,6 @@
power-switch: True
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_timer':
- build-node: 'dt-berlin-community-pod'
- config-pod: 'dt-berlin-pod-gpon'
- 'disable-job': true
- release: '2.4'
- branch: 'voltha-2.4'
- num-of-openonu: '2'
- 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: '1'
-
-
- # Berlin POD test job - voltha-2.4 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.4'
- branch: 'voltha-2.4'
- test-repo: 'voltha-system-tests'
- profile: '1T8GEM'
- power-switch: True
- pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
-
# Berlin pod with olt/onu - manual test job, voltha master build job
- 'build_pod_manual':
build-node: 'dt-berlin-community-pod'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 2a18ce8..71989d0 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -64,7 +64,7 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-test-bbsim-2.5'
+ name: 'periodic-voltha-test-bbsim-2.6'
pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
build-node: 'qct-pod4-node2'
make-target: functional-single-kind
@@ -72,7 +72,7 @@
make-target-errortest: bbsim-errorscenarios
make-target-alarmtest: bbsim-alarms-kind
withAlarms: true
- code-branch: 'voltha-2.5'
+ code-branch: 'voltha-2.6'
onus: 2
pons: 2
time-trigger: "H H/12 * * *"
@@ -88,10 +88,10 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-etcd-test-2.5'
+ name: 'periodic-voltha-etcd-test-2.6'
pipeline-script: 'voltha-system-test-bbsim.groovy'
build-node: 'ubuntu16.04-basebuild-4c-8g'
- code-branch: 'voltha-2.5'
+ code-branch: 'voltha-2.6'
make-target: sanity-multi-kind
onus: 2
pons: 2
@@ -110,10 +110,10 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-sanity-test-multi-runs-2.5'
+ name: 'periodic-voltha-sanity-test-multi-runs-2.6'
pipeline-script: 'voltha-go-multi-tests.groovy'
build-node: 'qct-pod4-node2'
- code-branch: 'voltha-2.5'
+ code-branch: 'voltha-2.6'
make-target: sanity-kind
onus: 1
pons: 1
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 788efb3..80ff492 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -267,9 +267,9 @@
extraHelmFlags: '--set use_openonu_adapter_go=true'
openonuAdapterReplicas: 1
- # voltha-2.5 Jobs
+ # voltha-2.6 Jobs
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-voltha-2.5-1-16-32-att-subscribers'
+ name: 'voltha-scale-measurements-voltha-2.6-1-16-32-att-subscribers'
'disable-job': false
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
@@ -283,7 +283,7 @@
withIgmp: false
extraHelmFlags: '--set defaults.rw_core.timeout=30s '
openonuAdapterReplicas: 8
- release: voltha-2.5
+ release: voltha-2.6
bbsimImg: ''
rwCoreImg: ''
ofAgentImg: ''
@@ -292,7 +292,7 @@
onosImg: ''
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-voltha-2.5-2-16-32-dt-subscribers'
+ name: 'voltha-scale-measurements-voltha-2.6-2-16-32-dt-subscribers'
'disable-job': false
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
@@ -307,7 +307,7 @@
withIgmp: false
extraHelmFlags: '--set defaults.rw_core.timeout=30s '
openonuAdapterReplicas: 8
- release: voltha-2.5
+ release: voltha-2.6
bbsimImg: ''
rwCoreImg: ''
ofAgentImg: ''
@@ -316,7 +316,7 @@
onosImg: ''
- 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-voltha-2.5-1-16-32-tt-subscribers'
+ name: 'voltha-scale-measurements-voltha-2.6-1-16-32-tt-subscribers'
'disable-job': false
build-node: 'onf-pod1-head-node'
time-trigger: "H H/4 * * *"
@@ -331,7 +331,7 @@
withIgmp: true
extraHelmFlags: '--set defaults.rw_core.timeout=30s '
openonuAdapterReplicas: 8
- release: voltha-2.5
+ release: voltha-2.6
bbsimImg: ''
rwCoreImg: ''
ofAgentImg: ''