Merge "VOL-3292 Consolidate BBSIM tests"
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index c6662c0..90810dd 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -37,7 +37,7 @@
DEPLOY_K8S="yes"
VOLTHA_LOG_LEVEL="DEBUG"
CONFIG_SADIS="no"
- ROBOT_MISC_ARGS="${params.extraRobotArgs}"
+ ROBOT_MISC_ARGS="-e PowerSwitch ${params.extraRobotArgs}"
}
stages {
diff --git a/jjb/pipeline/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha-system-test-bbsim.groovy
index 0455aa4..7c4ceba 100644
--- a/jjb/pipeline/voltha-system-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-system-test-bbsim.groovy
@@ -93,7 +93,7 @@
}
}
- stage('Kubernetes Functional Tests') {
+ stage('Kubernetes ETCD Scale Test') {
steps {
sh '''
make ROBOT_DEBUG_LOG_OPT="-l functional_log.html -r functional_report.html -o functional_output.xml" -C $WORKSPACE/voltha-system-tests system-scale-test
@@ -101,7 +101,7 @@
}
}
- stage('Kubernetes Failure Scenario Tests') {
+ stage('Kubernetes ETCD Failure Test') {
steps {
sh '''
make ROBOT_DEBUG_LOG_OPT="-l failure_log.html -r failure_report.html -o failure_output.xml" -C $WORKSPACE/voltha-system-tests failure-test
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index d63f1b6..8445f0d 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -9,44 +9,27 @@
jobs:
- 'voltha-periodic-test':
- name: 'periodic-voltha-sanity-test'
- build-node: 'qct-pod4-node2'
- code-branch: 'master'
- make-target: sanity-multi-kind
- onus: 2
- pons: 2
- time-trigger: "H H/6 * * *"
-
- - 'voltha-periodic-test':
- name: 'periodic-voltha-sanity-test-2.3'
- build-node: 'qct-pod4-node2'
- code-branch: 'voltha-2.3'
- make-target: sanity-multi-kind
- onus: 2
- pons: 2
- time-trigger: "H H/6 * * *"
-
- - 'voltha-periodic-test':
name: 'periodic-voltha-test-bbsim'
pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
build-node: 'qct-pod4-node2'
make-target: functional-single-kind
code-branch: 'master'
- onus: 1
- pons: 1
+ onus: 2
+ pons: 2
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-functional-test-2.3'
+ name: 'periodic-voltha-test-bbsim-2.3'
+ pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
build-node: 'qct-pod4-node2'
- code-branch: 'voltha-2.3'
make-target: functional-single-kind
- onus: 1
- pons: 1
+ code-branch: 'voltha-2.3'
+ onus: 2
+ pons: 2
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-system-test'
+ name: 'periodic-voltha-etcd-test'
pipeline-script: 'voltha-system-test-bbsim.groovy'
build-node: 'ubuntu16.04-basebuild-4c-8g'
code-branch: 'master'
@@ -56,7 +39,7 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-system-test-2.3'
+ name: 'periodic-voltha-etcd-test-2.3'
pipeline-script: 'voltha-system-test-bbsim.groovy'
build-node: 'ubuntu16.04-basebuild-4c-8g'
code-branch: 'voltha-2.3'
@@ -75,7 +58,7 @@
onus: 1
pons: 1
test-runs: 5
- time-trigger: "H H/6 * * *"
+ time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-sanity-test-multi-runs-2.3'
@@ -86,25 +69,7 @@
onus: 1
pons: 1
test-runs: 5
- time-trigger: "H H/6 * * *"
-
- - 'voltha-periodic-test':
- name: 'periodic-voltha-alarm-test'
- build-node: 'qct-pod4-node2'
- code-branch: 'master'
- make-target: bbsim-alarms-kind
- onus: 1
- pons: 1
- time-trigger: "H H/3 * * *"
-
- - 'voltha-periodic-test':
- name: 'periodic-voltha-alarm-test-2.3'
- build-node: 'qct-pod4-node2'
- code-branch: 'voltha-2.3'
- make-target: bbsim-alarms-kind
- onus: 1
- pons: 1
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
name: 'nightly-voltha-DTflow-sanity-test'