Merge "[VOL-2717] Added plot for activated ONUs/ports"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index c0f957c..ac9258d 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -836,7 +836,7 @@
- '{branch}'
- job-template:
- name: 'build_{config-pod}_{profile}_voltha_{release}'
+ name: 'build_{config-pod}_{profile}{name-extension}_voltha_{release}'
id: build_voltha_pod_release
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -938,6 +938,11 @@
default: '{with-kind}'
description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
+ - bool:
+ name: ofagentGo
+ default: '{use-ofagent-go}'
+ description: "Installs POD with go version when true"
+
concurrent: true
pipeline-scm:
@@ -954,7 +959,7 @@
H {time} * * *
- job-template:
- name: 'build_{config-pod}_{profile}_voltha_{release}_test'
+ name: 'build_{config-pod}_{profile}_voltha{name-extension}_{release}_test'
id: build_voltha_pod_test
description: |
<!-- Managed by Jenkins Job Builder -->
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 1b46bf7..2526400 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -9,6 +9,7 @@
build-timeout: '300'
with-kind: false
+ use-ofagent-go: false
onos-version: '2.2'
power-switch: False
@@ -189,12 +190,66 @@
profile: '1T4GEM-bal31'
time: '4'
+ # Menlo pod test job - master 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'
+ released: false
+ test-repo: 'voltha-system-tests'
+ profile: '1T4GEM-bal31'
+
+ # Menlo pod with olt/onu - Uses GO Version - Default tech profile and timer based job
+ - 'build_voltha_pod_release':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ release: 'master'
+ branch: 'master'
+ name-extension: '_GO'
+ use-ofagent-go: true
+ released: false
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
+ oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ configurePod: true
+ profile: 'Default'
+ time: '6'
+
# 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'
+ name-extension: '_GO'
+ released: false
+ test-repo: 'voltha-system-tests'
+ profile: 'Default'
+
+ # Menlo pod with olt/onu - Uses GO Version - Default tech profile and timer based job
+ - 'build_voltha_pod_release':
+ build-node: 'menlo-demo-pod'
+ config-pod: 'onf-demo-pod'
+ release: 'master'
+ branch: 'master'
+ name-extension: '_GO'
+ use-ofagent-go: true
+ released: false
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
+ oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ configurePod: true
+ profile: '1T4GEM-bal31'
+ time: '8'
+
+ # 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'
+ name-extension: '_GO'
released: false
test-repo: 'voltha-system-tests'
profile: '1T4GEM-bal31'
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 585b12e..8dd729d 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -106,6 +106,27 @@
build-timeout: 30
docker-repo: 'omecproject'
+# for nucleus
+- project:
+ name: Nucleus
+ project: '{name}'
+
+ build-node: 'intel-102'
+
+ github-organization: 'omec-project'
+
+ github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
+ github_pr_org_list:
+ - 'omec-project'
+
+ jobs:
+ - 'omec-fossa':
+ pipeline-file: 'omec-fossa-scan.groovy'
+ build-node: 'omec-qa'
+ - 'omec-reuse':
+ pipeline-file: 'omec-reuse-scan.groovy'
+ build-node: 'omec-qa'
+
# Combined pipeline
- job-template:
id: 'omec-combined'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index b0e332a..33c33c5 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -10,7 +10,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-8-32-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 32
ponPorts: 8
expectedOnus: 256
@@ -18,15 +18,31 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-8-32-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 32
ponPorts: 8
expectedOnus: 256
BBSIMdelay: 1000
- 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-8-48-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ onuPerPon: 48
+ ponPorts: 8
+ expectedOnus: 384
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-8-48-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ onuPerPon: 48
+ ponPorts: 8
+ expectedOnus: 384
+ BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-4-32-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 32
ponPorts: 4
expectedOnus: 128
@@ -34,7 +50,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-4-32-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 32
ponPorts: 4
expectedOnus: 128
@@ -42,7 +58,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-16-32-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 32
ponPorts: 16
expectedOnus: 512
@@ -50,7 +66,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-16-32-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 32
ponPorts: 16
expectedOnus: 512
@@ -58,7 +74,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-4-64-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 64
ponPorts: 4
expectedOnus: 256
@@ -66,7 +82,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-4-64-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 64
ponPorts: 4
expectedOnus: 256
@@ -74,7 +90,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-4-128-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 128
ponPorts: 4
expectedOnus: 512
@@ -82,7 +98,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-4-128-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 128
ponPorts: 4
expectedOnus: 512
@@ -90,7 +106,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-1-128-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 128
ponPorts: 1
expectedOnus: 128
@@ -98,7 +114,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-1-128-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 128
ponPorts: 1
expectedOnus: 128
@@ -106,7 +122,7 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-1-64-200ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 64
ponPorts: 1
expectedOnus: 64
@@ -114,11 +130,27 @@
- 'voltha-scale-measurements-periodic':
name: 'voltha-scale-measurements-periodic-1-64-1000ms'
build-node: 'onf-pod1-head-node'
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/4 * * *"
onuPerPon: 64
ponPorts: 1
expectedOnus: 64
BBSIMdelay: 1000
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-1-1-200ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ onuPerPon: 1
+ ponPorts: 1
+ expectedOnus: 1
+ BBSIMdelay: 200
+ - 'voltha-scale-measurements-periodic':
+ name: 'voltha-scale-measurements-periodic-1-1-1000ms'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ onuPerPon: 1
+ ponPorts: 1
+ expectedOnus: 1
+ BBSIMdelay: 1000
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-dev'
build-node: 'voltha-scale-dev'
@@ -224,6 +256,16 @@
default: 'voltha/voltha-rw-core:master'
description: 'Custom image selection for VOLTHA (repo:tag)'
+ - string:
+ name: openoltAdapterImg
+ default: voltha/voltha-openolt-adapter:master
+ description: 'Custom image selection for Openolt Adapter (repo:tag)'
+
+ - string:
+ name: openonuAdapterImg
+ default: voltha/voltha-openonu-adapter:master
+ description: 'Custom image selection for Openonu Adapter (repo:tag)'
+
project-type: pipeline
concurrent: false