Increasing vim_status_max_wait_time to 2min in vim_lib.robot

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

diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index 7a05681..edf32b7 100755 (executable)
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -32,6 +32,13 @@ download_packages(){
         git checkout ${PACKAGES})
 }
 
+create_vim(){
+    echo -e "\nCreating VIM ${VIM_TARGET}"
+    osm vim-create --name ${VIM_TARGET} --user ${OS_USERNAME} --password ${OS_PASSWORD} --tenant ${OS_PROJECT_NAME} \
+                   --auth_url ${OS_AUTH_URL} --account_type openstack --description vim \
+                   --config "{management_network_name: ${VIM_MGMT_NET}}" || true
+}
+
 PARAMS=""
 
 while (( "$#" )); do
@@ -45,27 +52,36 @@ while (( "$#" )); do
             shift 2
             ;;
         -o|--osmclientversion)
-            OSMCLIENT=$2 install_osmclient
+            OSMCLIENT=$2 && install_osmclient
             shift 2
             ;;
+        -c|--createvim)
+            create_vim
+            shift 1
+            ;;
         -h|--help)
             echo "OSM TESTS TOOL
 
 Usage:
         docker run --rm=true -t osmtests --env-file <env_file> \\
-            -v <path_to_reports>:/reports osmtests -v <path_to_clouds.yaml>:/robot-systest/clouds.yaml \\
-            -v <path_to_kubeconfig>:/robot-systest/kubeconfig.yaml \\
-            -o <osmclient_version> -p <package_branch> -t <testing_tags>
-            
+            -v <path_to_reports>:/reports osmtests \\
+            -v <path_to_clouds.yaml>:/robot-systest/clouds.yaml \\
+            -v <path_to_kubeconfig>:/root/.kube/config \\
+            -o <osmclient_version> \\
+            -p <package_branch> \\
+            -t <testing_tags>
+
 Options:
         --env-file: It is the environmental file where is described the OSM target and VIM
         -o <osmclient_version> [OPTIONAL]: It is used to specify a particular osmclient version. Default: latest
         -p <package_branch> [OPTIONAL]: OSM packages repository branch. Default: master
         -t <testing_tags> [OPTIONAL]: Robot tests tags. [sanity, regression, particular_test]. Default: sanity
+        -c To create a VIM for the tests
 
 Volumes:
         <path_to_reports> [OPTIONAL]: It is the absolute path to reports location in the host
-        <path_to_clouds.yaml> [OPTIONAL]: It is the absolute path to the clouds.yaml file in the host"
+        <path_to_clouds.yaml> [OPTIONAL]: It is the absolute path to the clouds.yaml file in the host
+        <path_to_kubeconfig> [OPTIONAL]: It is the kubeconfig file to be used for k8s clusters"
 
             exit 0
             ;;
@@ -82,13 +98,17 @@ done
 
 eval set -- "$PARAMS"
 
-if [[ -z $TEST ]]; then
+if [[ -n "$BRANCH_NAME" ]]; then
+    PACKAGES=$BRANCH_NAME && download_packages
+    OSMCLIENT=$BRANCH_NAME && install_osmclient
+fi
+
+if [[ -z "${TEST}" ]]; then
     printf "Test not provided. \nRunning default test: sanity\n"
     TEST="sanity"
 fi
 
-
-if [[ -n "$TEST" ]]; then
+if [[ -n "${TEST}" ]]; then
     robot -d ${ROBOT_DEVOPS_FOLDER}/reports -i ${TEST} ${ROBOT_DEVOPS_FOLDER}/testsuite/
     exit 0
 else