Merge "Using secure password for grafana"
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index 16f334b..d5fee86 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -12,6 +12,8 @@
num-of-openonu: '1'
num-of-onos: '1'
num-of-atomix: '0'
+ in-band-management: false
+ reinstall-olt: true
jobs:
# onlab pod1 build
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index c2c47fd..e62a52c 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -98,7 +98,7 @@
- bool:
name: reinstallOlt
- default: true
+ default: '{reinstall-olt}'
description: "Re-install olt software bringing up CORD"
- bool:
@@ -126,6 +126,11 @@
default: '{num-of-onos}'
description: 'Installs the specified Number of ONOS instances'
+ - bool:
+ name: inBandManagement
+ default: '{in-band-management}'
+ description: 'Indicates whether POD is configured for in band management'
+
- string:
name: NumOfAtomix
default: '{num-of-atomix}'
@@ -220,7 +225,7 @@
- bool:
name: reinstallOlt
- default: true
+ default: '{reinstall-olt}'
description: "Re-install olt software bringing up CORD"
- bool:
@@ -476,7 +481,7 @@
- bool:
name: reinstallOlt
- default: true
+ default: '{reinstall-olt}'
description: "Re-install olt software bringing up CORD"
- bool:
@@ -578,7 +583,7 @@
- bool:
name: reinstallOlt
- default: true
+ default: '{reinstall-olt}'
description: "Re-install olt software bringing up CORD"
- bool:
@@ -949,7 +954,7 @@
- bool:
name: reinstallOlt
- default: true
+ default: '{reinstall-olt}'
description: "Re-install olt software bringing up CORD"
- bool:
@@ -962,6 +967,11 @@
default: '{VolthaEtcdPort}'
description: 'Localhost port that is forwarded to VOLTHA etcd'
+ - bool:
+ name: inBandManagement
+ default: '{in-band-management}'
+ description: 'Indicates whether POD is configured for in band management'
+
concurrent: true
pipeline-scm:
diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
index a5f6021..8a9a5f2 100644
--- a/jjb/cord-test/seba-release.yaml
+++ b/jjb/cord-test/seba-release.yaml
@@ -8,6 +8,8 @@
build-timeout: '300'
+ reinstall-olt: true
+
jobs:
# onlab pod1 build 1.0
- 'build_pod_manual_release':
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 00549e8..f4ef061 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -11,9 +11,11 @@
with-kind: false
power-switch: False
work-flow: ''
+ in-band-management: false
num-of-openonu: '1'
num-of-onos: '1'
num-of-atomix: '0'
+ reinstall-olt: true
jobs:
# flex OCP pod with olt/onu - manual test job, voltha master build job
@@ -150,7 +152,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: 'TP'
- time: '8'
+ time: '9'
# flex pod1 test job - released versions: uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -180,6 +182,8 @@
profile: 'Default'
time: '22'
VolthaEtcdPort: '9999'
+ in-band-management: true
+ reinstall-olt: false
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -205,7 +209,9 @@
configurePod: true
profile: '1T4GEM'
time: '1'
+ in-band-management: true
VolthaEtcdPort: '9999'
+ reinstall-olt: false
# Menlo pod test job - master test job uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -232,6 +238,8 @@
profile: '1T8GEM'
time: '4'
VolthaEtcdPort: '9999'
+ in-band-management: true
+ reinstall-olt: false
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -264,6 +272,8 @@
profile: '1T8GEM'
time: '7'
VolthaEtcdPort: '9999'
+ reinstall-olt: false
+ in-band-management: true
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -288,6 +298,8 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T4GEM'
+ reinstall-olt: false
+ in-band-management: true
- 'build_pod_test':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
@@ -306,6 +318,8 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: 'Default'
+ reinstall-olt: false
+ in-band-management: true
# ONF DEMO OCP test job - voltha-master branch
- 'build_pod_test':
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 721323c..a9c203b 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -839,6 +839,11 @@
description: 'Name of the Jenkins executor node to run the job on.'
- string:
+ name: timeout
+ default: '30'
+ description: 'Timeout period for this pipeline in minutes.'
+
+ - string:
name: ng40VM
default: '{ng40-vm}'
description: 'user@IP for accessing NG40 VM from the build node.'