Merge "Use cord-tester virtualenv during XOS core tests"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index e784f69..76da0cb 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -917,6 +917,11 @@
default: '{work-flow}'
description: 'Installs the specified work flow on the POD'
+ - string:
+ name: NumOfOpenOnu
+ default: '{num-of-openonu}'
+ description: 'Installs the specified Number of OpenOnu Adapters'
+
- bool:
name: configurePod
default: true
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index c461759..f9f64b0 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -11,6 +11,7 @@
with-kind: false
power-switch: False
work-flow: ''
+ num-of-openonu: '1'
jobs:
# flex OCP pod with olt/onu - manual test job, voltha master build job
@@ -59,6 +60,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'
@@ -82,6 +84,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'
@@ -128,6 +131,7 @@
config-pod: 'onf-demo-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'
@@ -172,6 +176,7 @@
config-pod: 'onf-demo-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'
@@ -194,6 +199,7 @@
config-pod: 'onf-demo-pod'
release: 'master'
branch: 'master'
+ num-of-openonu: '2'
name-extension: '_DT'
work-flow: 'DT'
test-repo: 'voltha-system-tests'
@@ -287,6 +293,7 @@
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'
@@ -332,6 +339,7 @@
config-pod: 'dt-berlin-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'
@@ -382,6 +390,7 @@
config-pod: 'dt-berlin-pod-gpon'
release: 'master'
branch: 'master'
+ num-of-openonu: '2'
name-extension: '_DT'
work-flow: 'DT'
test-repo: 'voltha-system-tests'
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 2561303..a06ac4f 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -20,7 +20,7 @@
project: '{name}'
build-node: 'omec-qa'
c3po-branch-name: 'multiUpfs'
- ngic-branch-name: 'master'
+ ngic-branch-name: 'central-cp-multi-upfs'
openmme-branch-name: 'paging'
pipeline-file: 'omec-postmerge.groovy'
@@ -42,6 +42,7 @@
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
- 'omec-install':
sub-project: '{name}'
+ branch: 'central-cp-multi-upfs'
pipeline-file: 'Jenkinsfile-omec-install-ngic-rtc-vnf.groovy'
- 'omec-fossa':
pipeline-file: 'omec-fossa-scan.groovy'
@@ -72,9 +73,11 @@
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
- 'omec-install':
sub-project: 'c3po-sgx'
+ branch: 'master'
pipeline-file: 'Jenkinsfile-omec-install-c3po-sgx-vnf.groovy'
- 'omec-install':
sub-project: 'c3po-hss'
+ branch: 'master'
pipeline-file: 'Jenkinsfile-omec-install-c3po-hss-vnf.groovy'
- 'omec-fossa':
pipeline-file: 'omec-fossa-scan.groovy'
@@ -105,6 +108,7 @@
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
- 'omec-install':
sub-project: '{name}'
+ branch: 'paging'
pipeline-file: 'Jenkinsfile-omec-install-openmme-vnf.groovy'
- 'omec-fossa':
pipeline-file: 'omec-fossa-scan.groovy'
@@ -289,6 +293,11 @@
default: '{project}'
description: 'Name of the project'
+ - string:
+ name: branch
+ default: '{branch}'
+ description: 'Branch of the project'
+
concurrent: false
pipeline-scm: