X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Frun_test.sh;h=b7bf29b856228473ccc313e138dbeec2d8e70322;hp=679245249343424ed46b2c44e00ea0175ebde4ad;hb=HEAD;hpb=9e367360ca558e4647b5a4cc3765fcd3f7804e3e

diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index 6792452..11c3e45 100755
--- 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" --skip-jujubundle
 
         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
 }
@@ -104,6 +104,10 @@ create_vim(){
         echo "VIM failed to enter ENABLED state"
         exit 1
     fi
+}
+
+
+create_sdnc(){
     if [ -n "${SDNC_URL}" ]; then
         osm sdnc-create --name sdnc-osm --type ${SDNC_TYPE} --user ${SDNC_USER} --password ${SDNC_PASSWORD} --url ${SDNC_URL}
         COUNTER=0
@@ -147,6 +151,7 @@ create_vim(){
             fi
         fi
     fi
+
 }
 
 
@@ -169,6 +174,7 @@ while (( "$#" )); do
             ;;
         -c|--createvim)
             create_vim
+            # create_sdnc
             create_k8scluster
             shift 1
             ;;
@@ -227,17 +233,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
-    robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
-    exit 0
+    robot -d ${ROBOT_DEVOPS_FOLDER}/reports --tagstatinclude "cluster_*" -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
 else
-    echo "Wrong test provided"
-    exit 1
+    echo "No test was provided. Exiting..."
 fi
 
-exit 1
+exit 0