commit 4c0c361020382a11dbf807a98ba5f893dc1e0c3e
author Andrea Campanella <andrea@opennetworking.org> Wed Sep 09 09:38:41 2020 +0000
committer Gerrit Code Review <gerrit@opencord.org> Wed Sep 09 09:38:41 2020 +0000
tree 7964d05dd94a15697f6f0c3ca39dc0abd71ac102
parent 0d9667293c0126c149539dfbe28962900e65812d
parent 893f70dc654f10376c079e062268371c8fd3e0d8

Merge "Revert "Fixing voltha system tests to account for IGMP""

jjb/cord-test/voltha.yaml

diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index ebf897c..a8fbf45 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -376,7 +376,7 @@
           test-type: 'Functional'
           test-repo: 'voltha-system-tests'
           pipeline-script: 'voltha-physical-soak-dt-tests.groovy'
-          time-trigger: "H H */3 * *"
+          time-trigger: "H H 20 * *"
 
       # ONF Menlo Soak POD test job - voltha-master branch
       # Run tests every three days

jjb/pipeline/voltha-physical-soak-tests.groovy

diff --git a/jjb/pipeline/voltha-physical-soak-tests.groovy b/jjb/pipeline/voltha-physical-soak-tests.groovy
index ff3b54a..e73bd3c 100644
--- a/jjb/pipeline/voltha-physical-soak-tests.groovy
+++ b/jjb/pipeline/voltha-physical-soak-tests.groovy
@@ -111,7 +111,7 @@
         mkdir -p $ROBOT_LOGS_DIR
         if [ "${params.testType}" == "Functional" ]; then
             if ( ${powerSwitch} ); then
-                export ROBOT_MISC_ARGS="--removekeywords wuks -i PowerSwitch -i sanity -i functional -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+                export ROBOT_MISC_ARGS="--removekeywords wuks -i PowerSwitch -i sanity -i functional -e DeleteOLT -e DisableONU_AuthCheck -e DisableDeleteONUandOLT -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
             else
                 export ROBOT_MISC_ARGS="--removekeywords wuks -e PowerSwitch -i sanity -i functional -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
             fi
@@ -151,7 +151,7 @@
       steps {
         sh """
         mkdir -p $ROBOT_LOGS_DIR
-        if [ "${params.testType}" == "Failure" ]; then
+        if [ "${params.testType}" == "Dataplane" ]; then
            export ROBOT_MISC_ARGS="--removekeywords wuks -i dataplane -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
            make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
         fi

jjb/pipeline/voltha-scale-test.groovy

diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 54ac693..ad25bde 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -469,7 +469,8 @@
 
       for bbsim in "${IDS[@]}"
       do
-        kubectl exec -t $bbsim bbsimctl onu list > $LOG_FOLDER/$bbsim-device-list.txt || true
+        kubectl exec -t $bbsim -- bbsimctl onu list > $LOG_FOLDER/$bbsim-device-list.txt || true
+        kubectl exec -t $bbsim -- bbsimctl service list > $LOG_FOLDER/$bbsim-service-list.txt || true
       done
       '''
       // get ONOS debug infos