VOL-1977 Modify back-to-back sanity test to use more ONUs
Change-Id: Ifc02109d4e4f090dde7de44afe6e8fd530cfd2d6
diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index ed2107b..a562fd5 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -38,7 +38,7 @@
VOLTHA_LOG_LEVEL="DEBUG"
CONFIG_SADIS="n"
EXTRA_HELM_FLAGS="${params.extraHelmFlags}"
- ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs -v teardown_device:False"
+ ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs"
}
stages {
@@ -103,20 +103,6 @@
# For testing multiple back-to-back runs
# Doing some manual cleanup to work around known issues in BBSim and ONOS apps
- OLT=\$( voltctl device list -f Type=openolt -q )
- ONU=\$( voltctl device list -f Type=brcm_openomci_onu -q )
-
- voltctl device disable \$OLT
- wait_for_state_change OLT openolt DISABLED UNKNOWN REACHABLE
- wait_for_state_change ONU brcm_openomci_onu ENABLED DISCOVERED UNREACHABLE
-
- voltctl device disable \$ONU
- wait_for_state_change ONU brcm_openomci_onu DISABLED UNKNOWN UNREACHABLE
-
- voltctl device delete \$OLT
-
- timeout 60 bash -c 'until voltctl device list -q | wc -l | grep -q 0; do echo "Waiting for all devices to be deleted"; voltctl device list; echo ""; sleep 5; done'
-
helm delete --purge bbsim # VOL-2342
helm delete --purge onos # VOL-2343, VOL-2363
clear_etcd service/voltha/resource_manager
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index ef41768..f252d65 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -34,9 +34,9 @@
build-node: 'qct-pod4-node2'
default-image-tag: 'master'
code-branch: 'master'
- make-target: sanity-kind
- onus: 1
- pons: 1
+ make-target: sanity-multi-kind
+ onus: 2
+ pons: 2
test-runs: 5
time-trigger: "H H/3 * * *"