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-817: L2 keywords for SRv6
[csit.git]
/
bootstrap-vpp-verify-semiweekly.sh
diff --git
a/bootstrap-vpp-verify-semiweekly.sh
b/bootstrap-vpp-verify-semiweekly.sh
index
8f46ac6
..
070dca2
100644
(file)
--- a/
bootstrap-vpp-verify-semiweekly.sh
+++ b/
bootstrap-vpp-verify-semiweekly.sh
@@
-28,6
+28,12
@@
ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
+# 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
@@
-270,6
+276,7
@@
echo Running functional tests on the VIRL system...
# There are used three iterations of functional tests there
# to check the stability and reliability of the results.
# There are used three iterations of functional tests there
# to check the stability and reliability of the results.
+partial_logs=""
for test_set in 1 2 3
do
echo
for test_set in 1 2 3
do
echo
@@
-283,9
+290,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
_func_test_set${test_set} \
+ --output
${LOG_PATH}/output
_func_test_set${test_set} \
tests/
PARTIAL_RC=$(echo $?)
tests/
PARTIAL_RC=$(echo $?)
+ partial_logs="${partial_logs} ${LOG_PATH}/output_func_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
@@
-343,11
+351,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_func_test_set1.xml ./log_func_test_set2.xml ./log_func_test_set3.xml
+ --output output.xml ${partial_logs}
# Remove unnecessary files
# Remove unnecessary files
-rm -f
./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml
+rm -f
${partial_logs}
# Archive artifacts
mkdir archive
# Archive artifacts
mkdir archive