VOL-2433 Turn off auto SADIS config, pipeline cleanup
Change-Id: I644e9796cefc8452f60e5121001dce02a466ea56
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index d5ecedb..7e1227e 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -36,7 +36,7 @@
WITH_BBSIM="y"
DEPLOY_K8S="y"
VOLTHA_LOG_LEVEL="DEBUG"
- CONFIG_SADIS="y"
+ CONFIG_SADIS="n"
EXTRA_HELM_FLAGS="${params.extraHelmFlags}"
ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs"
}
@@ -83,17 +83,7 @@
sh '''
mkdir -p $WORKSPACE/RobotLogs
git clone https://gerrit.opencord.org/voltha-system-tests
- for i in \$(seq 1 ${testRuns})
- do
- make -C $WORKSPACE/voltha-system-tests ${makeTarget}
- kubectl -n voltha delete pod -lapp=bbsim # VOL-2342
- kubectl -n voltha wait pod -lapp=bbsim --for condition=Ready --timeout=60s # VOL-2342
- http -a karaf:karaf --ignore-stdin DELETE http://localhost:8181/onos/v1/applications/org.opencord.dhcpl2relay/active > /dev/null # VOL-2343
- http -a karaf:karaf --ignore-stdin POST http://localhost:8181/onos/v1/applications/org.opencord.dhcpl2relay/active > /dev/null # VOL-2343
- http -a karaf:karaf --ignore-stdin DELETE http://localhost:8181/onos/v1/applications/org.opencord.aaa/active > /dev/null # VOL-2363
- http -a karaf:karaf --ignore-stdin POST http://localhost:8181/onos/v1/applications/org.opencord.aaa/active > /dev/null # VOL-2363
- sleep 10
- done
+ make -C $WORKSPACE/voltha-system-tests ${makeTarget}
'''
}
}