X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=robot-systest%2Frun_test.sh;h=407a453171866ed9219c716060ac453d589e7c86;hb=02300c0de9adce82786beefac1d231cdc67f8b7e;hp=f5753ccb06a602e9deb9789cd8fbc18fa48bae89;hpb=6366c6877972bc918c0349f0509dfb95d760d79a;p=osm%2Ftests.git

diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index f5753cc..407a453 100755
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -37,6 +37,18 @@ create_vim(){
     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
+    STATUS="PROCESSING"
+    i=0
+    while [[ ${STATUS} != "ENABLED" ]]
+    do
+        ((i++))
+        if [[ $i -eq 5 ]]; then
+            echo "VIM stuck in PROCESSING after 100 seconds"
+            exit 1
+        fi
+        sleep 20
+        STATUS=`osm vim-list --long | grep ${VIM_TARGET} | awk '{print $9}'`
+    done
 }
 
 PARAMS=""
@@ -52,7 +64,7 @@ while (( "$#" )); do
             shift 2
             ;;
         -o|--osmclientversion)
-            OSMCLIENT=$2 install_osmclient
+            OSMCLIENT=$2 && install_osmclient
             shift 2
             ;;
         -c|--createvim)
@@ -98,8 +110,9 @@ done
 
 eval set -- "$PARAMS"
 
-if [[ -n "$stackName" ]]; then
-    export OSM_HOSTNAME=osm${stackName}_nbi
+if [[ -n "$BRANCH_NAME" ]]; then
+    PACKAGES=$BRANCH_NAME && download_packages
+    OSMCLIENT=$BRANCH_NAME && install_osmclient
 fi
 
 if [[ -z "${TEST}" ]]; then