[VOL-3315] Removing duplication of jobs on master
Change-Id: Ie5d91c5f90006ac48b8de3fa5b6d41bc565dce46
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 0630b30..521b506 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -68,7 +68,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: 'Default'
- time: '1'
+ time: '3'
# flex pod1 test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -80,31 +80,6 @@
test-repo: 'voltha-system-tests'
profile: 'Default'
- # flex OCP pod with olt/onu - uses 1TCONT/4GEMs tech profile on voltha - timer based job
- - 'build_voltha_pod_release':
- build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord'
- release: 'master'
- branch: 'master'
- 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: '3'
-
- # flex pod1 test job - test job uses 1TCONT/4GEMs tech profile - using voltha branch
- - 'build_voltha_pod_test':
- build-node: 'qa-testvm-pod'
- config-pod: 'flex-ocp-cord'
- release: 'master'
- branch: 'master'
- 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':
build-node: 'qa-testvm-pod'
@@ -118,7 +93,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T4GEM'
- time: '4'
+ time: '1'
# flex pod1 test job - released versions: uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -134,32 +109,6 @@
- 'build_voltha_pod_release':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
- release: 'master'
- branch: 'master'
- 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: '1'
- 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'
- release: 'master'
- branch: 'master'
- test-repo: 'voltha-system-tests'
- profile: 'Default'
- power-switch: True
-
- # Menlo pod with olt/onu - Default tech profile and timer based job
- - 'build_voltha_pod_release':
- build-node: 'menlo-demo-pod'
- config-pod: 'onf-demo-pod'
release: '2.4'
branch: 'voltha-2.4'
num-of-openonu: '2'
@@ -169,7 +118,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: 'Default'
- time: '3'
+ time: '1'
VolthaEtcdPort: '9999'
# Menlo pod test job - uses tech profile on voltha branch
@@ -195,7 +144,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T4GEM'
- time: '4'
+ time: '3'
VolthaEtcdPort: '9999'
# Menlo pod test job - master test job uses tech profile on voltha branch
@@ -221,7 +170,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '6'
+ time: '7'
VolthaEtcdPort: '9999'
# Menlo pod test job - uses tech profile on voltha branch
@@ -253,7 +202,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '8'
+ time: '5'
VolthaEtcdPort: '9999'
# Menlo pod test job - uses tech profile on voltha branch
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index 3ce71e8..805f909 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -64,7 +64,7 @@
if [ "${params.branch}" != "master" ]; then
cd $WORKSPACE/kind-voltha
source releases/${params.branch}
- VC_VERSION=1.0.18
+ VC_VERSION=1.1.8
else
VC_VERSION=\$(curl -sSL https://api.github.com/repos/opencord/voltctl/releases/latest | jq -r .tag_name | sed -e 's/^v//g')
fi
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index f7bb0a6..a05cb65 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -64,7 +64,7 @@
if [ "${params.branch}" != "master" ]; then
cd $WORKSPACE/kind-voltha
source releases/${params.branch}
- VC_VERSION=1.0.18
+ VC_VERSION=1.1.8
else
VC_VERSION=\$(curl -sSL https://api.github.com/repos/opencord/voltctl/releases/latest | jq -r .tag_name | sed -e 's/^v//g')
fi