[VOL-4070] Updated voltha soak testing pipeline script
Change-Id: If076d059dcc02449d45a13352c58a6ca19e7f669
diff --git a/jjb/pipeline/voltha/master/physical-build.groovy b/jjb/pipeline/voltha/master/physical-build.groovy
index 05a059e..49fd221 100644
--- a/jjb/pipeline/voltha/master/physical-build.groovy
+++ b/jjb/pipeline/voltha/master/physical-build.groovy
@@ -108,6 +108,12 @@
"--set onos-classic.onosOfPort=31653 " +
"--set onos-classic.individualOpenFlowNodePorts=true "
+ def bbsimReplica = 0
+ if (installBBSim) {
+ bbsimReplica = 1
+ extraHelmFlags = extraHelmFlags + " --set onu=${onuNumber},pon=${ponNumber} "
+ }
+
volthaDeploy([
workflow: workFlow.toLowerCase(),
extraHelmFlags: extraHelmFlags,
@@ -115,10 +121,9 @@
kubeconfig: "$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf",
onosReplica: params.NumOfOnos,
atomixReplica: params.NumOfAtomix,
- // NOTE does this needs to be configured?
- kafkaReplica: 3,
- etcdReplica: 3,
- bbsimReplica: 0,
+ kafkaReplica: params.NumOfKafka,
+ etcdReplica: params.NumOfAtomix,
+ bbsimReplica: bbsimReplica.toInteger(),
])
}
sh """
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index e5ac6bc..bd0f342 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -90,7 +90,7 @@
- bool:
name: installBBSim
- default: false
+ default: '{installBBSim}'
description: "Install the BBSim container"
- string:
@@ -108,6 +108,16 @@
default: '{num-of-atomix}'
description: 'Installs the specified Number of Atomix Instances'
+ - string:
+ name: NumOfKafka
+ default: '{num-of-kafka}'
+ description: 'Installs the specified Number of Kafka Instances'
+
+ - string:
+ name: NumOfEtcd
+ default: '{num-of-etcd}'
+ description: 'Installs the specified Number of Etcd Instances'
+
- bool:
name: configurePod
default: true
@@ -177,6 +187,42 @@
# VOLTHA Build Jobs
- job-template:
+ name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}_manual'
+ id: build_voltha_pod_manual
+ disabled: '{disable-job}'
+ description: |
+ Manual Build on POD {config-pod}, using pipeline/{pipeline-script} in {gerrit-server-url}/ci-management' <br /><br />
+ Created from job-template {id} from ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml <br />
+ Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
+ Copyright (c) 2018 Open Networking Foundation (ONF)
+
+ <<: *voltha-pipe-job-boiler-plate
+ # default values
+ pipeline-script: 'voltha/master/physical-build.groovy'
+ VolthaEtcdPort: 2379
+ num-of-openonu: 1
+ num-of-onos: 1
+ num-of-atomix: 0
+ num-of-kafka: 1
+ num-of-etcd: 1
+ test-repo: 'voltha-system-tests'
+ release: 'master'
+ name-extension: ''
+ branch: 'master'
+ configurePod: true
+ volthaHelmChartsChange: ''
+ profile: 'Default'
+ logLevel: 'DEBUG'
+ installBBSim: false
+
+ <<: *voltha-build-job-parameters
+
+ concurrent: true
+ project-type: pipeline
+ dsl: !include-raw-escape: ../pipeline/{pipeline-script}
+
+# VOLTHA Build Jobs
+- job-template:
name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
id: build_voltha_pod_release_timer
disabled: '{disable-job}'
@@ -193,6 +239,8 @@
num-of-openonu: 1
num-of-onos: 3
num-of-atomix: 3
+ num-of-kafka: 3
+ num-of-etcd: 3
test-repo: 'voltha-system-tests'
release: 'master'
name-extension: ''
@@ -201,6 +249,7 @@
volthaHelmChartsChange: ''
profile: 'Default'
logLevel: 'DEBUG'
+ installBBSim: false
<<: *voltha-build-job-parameters
@@ -231,6 +280,9 @@
branch: 'voltha-2.7'
volthaHelmChartsChange: '' # this is not supported in the VOLTHA-2.7 build, but the parameters are shared, ideally we should split them
logLevel: 'DEBUG'
+ installBBSim: false
+ num-of-kafka: 1
+ num-of-etcd: 1
<<: *voltha-build-job-parameters
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 86cddd9..90f19f5 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -293,22 +293,15 @@
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-test'
- # Menlo pod with olt/onu - Default tech profile and timer based job
# ONF Menlo Soak POD build job - voltha-master branch
- # FIXME once the soak-pod is back use 'build_voltha_pod_release_timer'
- - 'build_pod_manual':
+ - 'build_voltha_pod_manual':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
- release: 'master'
installBBSim: true
- branch: 'master'
profile: '1T8GEM'
- test-repo: 'voltha-system-tests'
name-extension: '_DT'
work-flow: 'DT'
reinstall-olt: false
- Jenkinsfile: 'Jenkinsfile-voltha-build'
- configurePod: true
num-of-onus: 16
num-of-ponports: 8