Merge "SEBA-977 invoke redfish importer physical tests nightly"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 6f36724..c78a2e3 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -922,6 +922,16 @@
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'
+
- bool:
name: configurePod
default: true
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 50c7040..a1bc79b 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -12,6 +12,8 @@
power-switch: False
work-flow: ''
num-of-openonu: '1'
+ num-of-onos: '1'
+ num-of-atomix: '0'
jobs:
# flex OCP pod with olt/onu - manual test job, voltha master build job
@@ -61,6 +63,8 @@
release: 'master'
branch: 'master'
num-of-openonu: '2'
+ num-of-onos: '3'
+ num-of-atomix: '3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
@@ -85,6 +89,8 @@
release: 'master'
branch: 'master'
num-of-openonu: '2'
+ num-of-onos: '3'
+ num-of-atomix: '3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index d3d28ab..cc5ea23 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -110,6 +110,21 @@
}
}
+ stage('Alarm Tests') {
+ environment {
+ ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/AlarmTests"
+ }
+ steps {
+ sh '''
+ set +e
+ mkdir -p $WORKSPACE/RobotLogs
+
+ export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
+ make -C $WORKSPACE/voltha/voltha-system-tests bbsim-alarms-kind || true
+ '''
+ }
+ }
+
stage('Failure/Recovery Tests') {
environment {
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/FailureTests"
@@ -139,8 +154,6 @@
'''
}
}
-
-
}
post {