Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Report: Meltdown/Spectre
[csit.git]
/
bootstrap-vpp-verify-weekly.sh
diff --git
a/bootstrap-vpp-verify-weekly.sh
b/bootstrap-vpp-verify-weekly.sh
index
be5a925
..
e732810
100644
(file)
--- a/
bootstrap-vpp-verify-weekly.sh
+++ b/
bootstrap-vpp-verify-weekly.sh
@@
-24,9
+24,16
@@
VIRL_USERNAME=jenkins-in
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
+VIRL_SESSION_EXPIRY="620"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# Create tmp dir
+mkdir ${SCRIPT_DIR}/tmp
+
+# Use tmp dir to store log files
+LOG_PATH="${SCRIPT_DIR}/tmp"
+
if [ -f "/etc/redhat-release" ]; then
DISTRO="CENTOS"
sudo yum install -y python-devel python-virtualenv
if [ -f "/etc/redhat-release" ]; then
DISTRO="CENTOS"
sudo yum install -y python-devel python-virtualenv
@@
-118,7
+125,7
@@
done
# Temporarily download VPP and DPDK packages from nexus.fd.io
case "$DISTRO" in
CENTOS )
# Temporarily download VPP and DPDK packages from nexus.fd.io
case "$DISTRO" in
CENTOS )
- VPP_ARTIFACTS="vpp vpp-de
buginfo vpp-de
vel vpp-lib vpp-plugins"
+ VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins"
DPDK_ARTIFACTS=""
PACKAGE="rpm"
VPP_CLASSIFIER=""
DPDK_ARTIFACTS=""
PACKAGE="rpm"
VPP_CLASSIFIER=""
@@
-186,7
+193,9
@@
function stop_virl_simulation {
VIRL_SID=$(ssh ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER} \
VIRL_SID=$(ssh ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER} \
- "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_PKGS_FULL[@]}")
+ "start-testcase -vv --copy ${VIRL_TOPOLOGY} \
+ --expiry ${VIRL_SESSION_EXPIRY} \
+ --release ${VIRL_RELEASE} ${VPP_PKGS_FULL[@]}")
retval=$?
if [ ${retval} -ne "0" ]; then
echo "VIRL simulation start failed"
retval=$?
if [ ${retval} -ne "0" ]; then
echo "VIRL simulation start failed"
@@
-228,20
+237,22
@@
pip install -r ${SCRIPT_DIR}/requirements.txt
RC=0
MORE_FAILS=0
RC=0
MORE_FAILS=0
+partial_logs=""
for test_set in 1 2 3
do
echo
echo ${test_set}. test loop
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
for test_set in 1 2 3
do
echo
echo ${test_set}. test loop
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "tests.func" \
+ --suite "tests.
vpp.
func" \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_single_link_topo \
- --include vm_envAND3_node
PACAKGE
_double_link_topo \
+ --include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \
--noncritical EXPECTED_FAILING \
--exclude PERFTEST \
--noncritical EXPECTED_FAILING \
- --output
log
_test_set${test_set} \
+ --output
${LOG_PATH}/output
_test_set${test_set} \
tests/
PARTIAL_RC=$(echo $?)
tests/
PARTIAL_RC=$(echo $?)
+ partial_logs="${partial_logs} ${LOG_PATH}/output_test_set${test_set}.xml"
if [ ${PARTIAL_RC} -eq 250 ]; then
MORE_FAILS=1
fi
if [ ${PARTIAL_RC} -eq 250 ]; then
MORE_FAILS=1
fi
@@
-287,11
+298,10
@@
echo Post-processing test data...
# Rebot output post-processing
rebot --noncritical EXPECTED_FAILING \
# Rebot output post-processing
rebot --noncritical EXPECTED_FAILING \
- --output output.xml \
- ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml
+ --output output.xml ${partial_logs}
# Remove unnecessary log files
# Remove unnecessary log files
-rm -f
./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml
+rm -f
${partial_logs}
echo Post-processing finished.
echo Post-processing finished.