Update from master part 2

[osm/tests.git] / robot-systest / run_test.sh

diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index 190889c..d4d5e97 100755 (executable)
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -44,7 +44,7 @@ create_k8scluster(){
     while [ $attempts -ge 0 ] ; do
         echo -e "\n$( date '+%F_%H:%M:%S' ) Creating K8s Cluster"
 
-        osm k8scluster-add --creds ${K8S_CREDENTIALS} --version "v1" --vim ${VIM_TARGET} --k8s-nets "{\"net1\": \"%{VIM_MGMT_NET}\"}" ${VIM_TARGET} --description "Robot cluster"
+        osm k8scluster-add --creds ${K8S_CREDENTIALS} --version "v1" --vim ${VIM_TARGET} --k8s-nets "{\"net1\": \"${VIM_MGMT_NET}\"}" ${VIM_TARGET} --description "Robot cluster"
 
         STATUS=""
         i=0
@@ -67,7 +67,7 @@ create_k8scluster(){
         ((attempts--))
     done
     if [ $attempts -lt 0 ] ; then
-        echo "VIM failed to enter ENABLED state"
+        echo "K8s cluster failed to enter ENABLED state"
         exit 1
     fi
 }
@@ -227,17 +227,10 @@ if [ "$RUN_CONFORMANCE_TESTS" = true ] ; then
     python3 ${ROBOT_DEVOPS_FOLDER}/conformance-tests/run_conformance_tests.py
 fi
 
-if [[ -z "${TEST}" ]]; then
-    printf "Test not provided. \nRunning default test: sanity\n"
-    TEST="sanity"
-fi
-
 if [[ -n "${TEST}" ]]; then
-    pabot --processes 2 -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
-    exit 0
+    robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
 else
-    echo "Wrong test provided"
-    exit 1
+    echo "No test was provided. Exiting..."
 fi
 
-exit 1
+exit 0