From 9fc2b84c815dbadf688a28b9ae0ca710ca71a9cd Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 26 Jun 2020 14:57:09 -0400 Subject: [PATCH] Merge v8.0 into master Test contributions from master Fix permission for devops-stages files (+x) Adding the repository to CI/CD pipeline Adding VIM to OSM option Adding BRANCH_NAME variable for release tests Adding prometheus_host env variable for ci/cd git cherry-pick -n e1a9c5709cce246d2cca273be7d8f61b8404efea^..72556ca8d5a07199c182a586688bbebe8cf1cfad Author: Felipe Vicens Signed-off-by: beierlm Adds test EPA-01 for SR-IOV Signed-off-by: garciaale Retry vim-create Sometimes it appears that the vim-create command gets issued before LCM is properly ready, so as a workaround, this tries a number of times to create the VIM before giving up. Signed-off-by: beierlm Fixing Logic Breaks out of the loop once the vim is enabled Signed-off-by: Mark Beierl Added test [K8s-04] OpenLDAP Signed-off-by: ramonsalguer ================================================================== Signed-off-by: Mark Beierl Change-Id: Id436df42b735aa856e946c5c693f291bd0ba2d44 --- robot-systest/run_test.sh | 44 ++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh index 7e96d92..a279ff0 100755 --- a/robot-systest/run_test.sh +++ b/robot-systest/run_test.sh @@ -33,24 +33,40 @@ download_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}, dataplane_physical_net: ${DATAPLANE:-physnet2}}" || 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 + + attempts=3 + while [ $attempts -ge 0 ] ; do + echo -e "\n$( date '+%F_%H:%M:%S' ) Creating 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}, dataplane_physical_net: ${DATAPLANE:-physnet2}}" || true + STATUS="PROCESSING" + i=0 + while [[ ${STATUS} != "ENABLED" ]] + do + ((i++)) + if [[ $i -eq 5 ]]; then + echo "VIM stuck in PROCESSING after 50 seconds" + osm vim-delete ${VIM_TARGET} + sleep 5 + break + fi + sleep 10 + STATUS=`osm vim-list --long | grep ${VIM_TARGET} | awk '{print $9}'` + done + if [[ ${STATUS} = "ENABLED" ]] ; then + break fi - sleep 20 - STATUS=`osm vim-list --long | grep ${VIM_TARGET} | awk '{print $9}'` + ((attempts--)) done + + if [ $attempts -lt 0 ] ; then + echo "VIM failed to enter ENABLED state" + exit 1 + fi } + PARAMS="" while (( "$#" )); do -- 2.25.1