aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2016-09-02 10:58:45 +0200
committerJan Gelety <jgelety@cisco.com>2016-09-12 10:46:54 +0000
commit8a38a84dceac843151d3e5c9367667999638ab10 (patch)
tree170211a6a4454490c7d7c7b739433a75a1654953
parent131efb9019691347a1a29796fa7f8f192f2bdf9a (diff)
Small changes in bootstraps of timed jobs
- weekly: set appropriate length of line in the console - semiweekly: set appropriate length of line in the console and remove classifier (-deb) from the info what vpp version will be tested Change-Id: I7ff36d9e61e922cd200b9248b7ba645b0b4cf54e Signed-off-by: Jan Gelety <jgelety@cisco.com>
-rw-r--r--bootstrap-vpp-verify-semiweekly.sh48
-rw-r--r--bootstrap-vpp-verify-weekly.sh20
2 files changed, 34 insertions, 34 deletions
diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index 27078e1a51..4f7c67333f 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
@@ -224,9 +224,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 +245,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 +262,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 +276,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 +290,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
diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index 4bf1726313..94688ed66d 100644
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -202,7 +202,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 \
@@ -222,10 +222,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
@@ -236,19 +236,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