Merge "[VOL-3034] updates to manual templates"
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index f4d304c..16f334b 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -8,6 +8,11 @@
build-timeout: '300'
+ work-flow: ''
+ num-of-openonu: '1'
+ num-of-onos: '1'
+ num-of-atomix: '0'
+
jobs:
# onlab pod1 build
- 'build_pod_manual':
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index c78a2e3..1b4dd59 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -116,6 +116,25 @@
default: '16'
description: "Onus per PonPort"
+ - string:
+ name: workFlow
+ default: '{work-flow}'
+ description: 'Installs and uses the specified work flow on the POD'
+
+ - string:
+ name: NumOfOpenOnu
+ default: '{num-of-openonu}'
+ description: 'Installs the specified Number of OpenOnu Adapters'
+
+ - string:
+ name: NumOfOnos
+ default: '{num-of-onos}'
+ description: 'Installs the specified Number of ONOS instances'
+
+ - string:
+ name: NumOfAtomix
+ default: '{num-of-atomix}'
+ description: 'Installs the specified Number of Atomix Instances'
concurrent: true
pipeline-scm:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index a54f0ee..c19d8f0 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -22,6 +22,7 @@
config-pod: 'flex-ocp-cord'
release: 'master'
branch: 'master'
+ num-of-openonu: '2'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
@@ -346,6 +347,26 @@
profile: 'Default'
+ # Infosys pod with olt/onu - Manual BUILD/TEST job
+ - 'build_pod_manual':
+ build-node: 'infosys-test-pod'
+ config-pod: 'infosys-pod'
+ release: 'master'
+ branch: 'master'
+ num-of-openonu: '2'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
+ profile: 'Default'
+ # infosys test job - Manual Job
+ - 'build_pod_test':
+ build-node: 'infosys-test-pod'
+ config-pod: 'infosys-pod'
+ branch: 'master'
+ test-repo: 'voltha-system-tests'
+ profile: 'Default'
+ Jenkinsfile: 'Jenkinsfile-voltha-test'
+
# Berlin pod with olt/onu - master versions Default tech profile and timer based job
- 'build_voltha_pod_release':
build-node: 'dt-berlin-community-pod'