VOL-3292 Consolidate BBSIM tests

Change-Id: I313ea3d5414b710eb1f1163ac6781179b521e257
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index f01a024..2e66338 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