X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-verify-weekly.sh;h=206670476d9273b0f152dabe66faf968842e3fb4;hp=6af904baeaf87e44eed3d82ae4700f9d2669b908;hb=78a8eb4d4a3b25cd55c955910ef3c93a7dc1dea1;hpb=9d052c6e49788c6c8240d2599812f737e83469b4

diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index 6af904baea..206670476d 100644
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -29,6 +29,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() {
@@ -113,12 +116,14 @@ else
     rm -f *.deb
     VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER)
     VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL)
-    wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}.deb" || exit
-    wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}.deb" || exit
-    wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}.deb" || exit
-    wget -q "${VPP_REPO_URL}/vpp-dpdk-dev/${VPP_STABLE_VER}/vpp-dpdk-dev-${VPP_STABLE_VER}.deb" || exit
-    wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${VPP_STABLE_VER}/vpp-dpdk-dkms-${VPP_STABLE_VER}.deb" || exit
-    wget -q "${VPP_REPO_URL}/vpp-lib/${VPP_STABLE_VER}/vpp-lib-${VPP_STABLE_VER}.deb" || exit
+    VPP_CLASSIFIER="-deb"
+    wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
+    wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
+    wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
+    wget -q "${VPP_REPO_URL}/vpp-dpdk-dev/${VPP_STABLE_VER}/vpp-dpdk-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
+    wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${VPP_STABLE_VER}/vpp-dpdk-dkms-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
+    wget -q "${VPP_REPO_URL}/vpp-lib/${VPP_STABLE_VER}/vpp-lib-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
+    wget -q "${VPP_REPO_URL}/vpp-plugins/${VPP_STABLE_VER}/vpp-plugins-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit
 fi
 
 VPP_DEBS=(*.deb)
@@ -154,7 +159,7 @@ function stop_virl_simulation {
 
 VIRL_SID=$(ssh ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}")
+    "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_FULL[@]}")
 retval=$?
 if [ "$?" -ne "0" ]; then
     echo "VIRL simulation start failed"
@@ -200,7 +205,7 @@ for test_set in 1 2 3
 do
     echo
     echo ${test_set}. test loop
-    PYTHONPATH=`pwd` pybot -L TRACE \
+    PYTHONPATH=`pwd` pybot -L TRACE -W 136\
         -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
         --suite "tests.func" \
         --include vm_envAND3_node_single_link_topo \
@@ -220,10 +225,10 @@ done
 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
@@ -234,19 +239,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