Merge "[VOL-3813] Update soak/manual build pipeline with new parameters"
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index d5fee86..02d8aba 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -14,6 +14,8 @@
     num-of-atomix: '0'
     in-band-management: false
     reinstall-olt: true
+    num-of-onus: ''
+    num-of-ponports: ''
 
     jobs:
       # onlab pod1 build
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index bd045b7..be17049 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -109,10 +109,15 @@
 
       - string:
           name: onuNumber
-          default: '16'
+          default: '{num-of-onus}'
           description: "Onus per PonPort"
 
       - string:
+          name: ponNumber
+          default: '{num-of-ponports}'
+          description: "Number of PON Ports"
+
+      - string:
           name: workFlow
           default: '{work-flow}'
           description: 'Installs and uses the specified work flow on the POD'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 22cf9a7..4e700da 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -21,6 +21,8 @@
     kindVolthaChange: ''
     cordTesterChange: ''
     oltAdapterAppLabel: 'adapter-open-olt'
+    num-of-onus: ''
+    num-of-ponports: ''
 
 
     jobs:
@@ -406,7 +408,6 @@
       - 'build_pod_manual':
           build-node: 'menlo-soak-pod'
           config-pod: 'onf-soak-pod'
-          'disable-job': true
           release: 'master'
           branch: 'master'
           profile: '1T8GEM'
@@ -416,6 +417,8 @@
           reinstall-olt: false
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
+          num-of-onus: 16
+          num-of-ponports: 8
 
       # ONF Menlo Soak POD test job - voltha-master branch
       # FIXME once the soak-pod is back use 'build_voltha_pod_test'
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index c59ea1a..4b3b761 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -82,6 +82,21 @@
           default: '{num-of-onos}'
           description: 'Installs the specified Number of ONOS instances'
 
+      - bool:
+          name: installBBSim
+          default: false
+          description: "Install the BBSim container"
+
+      - string:
+          name: onuNumber
+          default: '{num-of-onus}'
+          description: "Onus per PonPort"
+
+      - string:
+          name: ponNumber
+          default: '{num-of-ponports}'
+          description: "Number of PON Ports"
+
       - string:
           name: NumOfAtomix
           default: '{num-of-atomix}'