X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-verify-semiweekly.sh;h=c2ed4ea3e0c718ff97b3e4850c688ede6a6b2758;hp=27078e1a51d811ebac37d0c84925ed85430de413;hb=636b60b97e4b1dbd6df0701627fe731edec6100b;hpb=f29d526d71919986f3ea7f7c6fc1dd9c4fb56c8e

diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index 27078e1a51..c2ed4ea3e0 100644
--- a/bootstrap-vpp-verify-semiweekly.sh
+++ b/bootstrap-vpp-verify-semiweekly.sh
@@ -50,13 +50,13 @@ VPP_DEBS=(*.deb)
 echo ${VPP_DEBS[@]}
 
 VPP_VER=$(echo ${VPP_DEBS#vpp-})
-VPP_VER=$(echo ${VPP_VER%.deb})
-echo VPP version to be tested: ${VPP_VER}
+VPP_VER=$(echo ${VPP_VER%-deb.deb})
 
 set +x
-echo "******************************************************************************"
-echo "1st step: Download VPP packages                                       FINISHED"
-echo "******************************************************************************"
+echo "****************************************************************************************************************************************"
+echo "1st step: Download VPP packages                                                                                                 FINISHED"
+echo "VPP version to be tested: ${VPP_VER}"
+echo "****************************************************************************************************************************************"
 set -x
 
 
@@ -70,9 +70,9 @@ echo Installing requirements...
 pip install -r ${SCRIPT_DIR}/requirements.txt
 
 set +x
-echo "******************************************************************************"
-echo "2nd step: Start virtual env and install requirements                  FINISHED"
-echo "******************************************************************************"
+echo "****************************************************************************************************************************************"
+echo "2nd step: Start virtual env and install requirements                                                                            FINISHED"
+echo "****************************************************************************************************************************************"
 set -x
 
 
@@ -87,6 +87,9 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
+VIRL_TOPOLOGY=double-ring-nested.xenial
+VIRL_RELEASE=csit-ubuntu-16.04.1_2016-10-10_1.4
+
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
 function ssh_do() {
@@ -194,7 +197,7 @@ function stop_virl_simulation {
 
 VIRL_SID=$(ssh ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "start-testcase -c double-ring-nested ${VPP_DEBS_VIRL[@]}")
+    "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_VIRL[@]}")
 retval=$?
 if [ "$?" -ne "0" ]; then
     echo "VIRL simulation start failed"
@@ -224,9 +227,9 @@ if [ "$?" -ne "0" ]; then
 fi
 
 set +x
-echo "******************************************************************************"
-echo "3rd step: Start the simulation on the VIRL server                     FINISHED"
-echo "******************************************************************************"
+echo "****************************************************************************************************************************************"
+echo "3rd step: Start the simulation on the VIRL server                                                                               FINISHED"
+echo "****************************************************************************************************************************************"
 set -x
 
 
@@ -245,7 +248,7 @@ do
     echo Functional test loop: ${test_set}
     echo
 
-    pybot -L TRACE \
+    pybot -L TRACE -W 136\
         -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
         --suite "tests.func" \
         --include vm_envAND3_node_single_link_topo \
@@ -262,9 +265,9 @@ do
 done
 
 set +x
-echo "******************************************************************************"
-echo "4th step: Run functional tests                                        FINISHED"
-echo "******************************************************************************"
+echo "****************************************************************************************************************************************"
+echo "4th step: Run functional tests                                                                                                  FINISHED"
+echo "****************************************************************************************************************************************"
 set -x
 
 # Set RETURN_STATUS=1 if some critical test failed
@@ -276,10 +279,10 @@ fi
 if [ ${RC} -eq 0 ]; then
     set +x
     echo
-    echo "=============================================================================="
-    echo "Final result of all test loops:                                       | PASS |"
+    echo "========================================================================================================================================"
+    echo "Final result of all test loops:                                                                                                 | PASS |"
     echo "All critical tests have passed."
-    echo "=============================================================================="
+    echo "========================================================================================================================================"
     echo
     set -x
 elif [ ${MORE_FAILS} -eq 0 ]; then
@@ -290,19 +293,19 @@ elif [ ${MORE_FAILS} -eq 0 ]; then
     fi
     set +x
     echo
-    echo "=============================================================================="
-    echo "Final result of all test loops:                                       | FAIL |"
+    echo "========================================================================================================================================"
+    echo "Final result of all test loops:                                                                                                 | FAIL |"
     echo "${RC} critical ${HLP_STR} failed."
-    echo "=============================================================================="
+    echo "========================================================================================================================================"
     echo
     set -x
 else
     set +x
     echo
-    echo "=============================================================================="
-    echo "Final result of all test loops:                                       | FAIL |"
+    echo "========================================================================================================================================"
+    echo "Final result of all test loops:                                                                                                 | FAIL |"
     echo "More then 250 critical tests have failed in one test loop."
-    echo "=============================================================================="
+    echo "========================================================================================================================================"
     echo
     set -x
 fi