Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1041: Trending dashboard
[csit.git]
/
bootstrap-vpp-verify-weekly.sh
diff --git
a/bootstrap-vpp-verify-weekly.sh
b/bootstrap-vpp-verify-weekly.sh
index
ecd0f15
..
8b12553
100644
(file)
--- a/
bootstrap-vpp-verify-weekly.sh
+++ b/
bootstrap-vpp-verify-weekly.sh
@@
-28,6
+28,12
@@
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
@@
-119,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-
debuginfo
vpp-devel vpp-lib vpp-plugins"
+ VPP_ARTIFACTS="vpp vpp-
selinux-policy
vpp-devel vpp-lib vpp-plugins"
DPDK_ARTIFACTS=""
PACKAGE="rpm"
VPP_CLASSIFIER=""
DPDK_ARTIFACTS=""
PACKAGE="rpm"
VPP_CLASSIFIER=""
@@
-231,6
+237,7
@@
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
for test_set in 1 2 3
do
echo
@@
-242,9
+249,10
@@
do
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \
--noncritical EXPECTED_FAILING \
--include vm_envAND3_node_double_link_topo \
--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
@@
-290,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.