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 1801 report update
[csit.git]
/
bootstrap-vpp-verify-semiweekly.sh
diff --git
a/bootstrap-vpp-verify-semiweekly.sh
b/bootstrap-vpp-verify-semiweekly.sh
index
b0402e0
..
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
@@
-55,7
+61,7
@@
else
# Download the latest VPP build install packages
rm -f *.${PACKAGE}
echo Downloading VPP packages...
# Download the latest VPP build install packages
rm -f *.${PACKAGE}
echo Downloading VPP packages...
- bash ${SCRIPT_DIR}/resources/tools/download_install_vpp_pkgs.sh --skip-install
+ bash ${SCRIPT_DIR}/resources/tools/
scripts/
download_install_vpp_pkgs.sh --skip-install
fi
# Take vpp package and get the vpp version
fi
# Take vpp package and get the vpp version
@@
-104,15
+110,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"
case "$DISTRO" in
CENTOS )
case "$DISTRO" in
CENTOS )
- VIRL_TOPOLOGY=
double-ring-nested.centos7
- VIRL_RELEASE=
csit-centos-7.3-1611_2017-02-14_1.3
+ VIRL_TOPOLOGY=
$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
+ VIRL_RELEASE=
$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
;;
UBUNTU )
;;
UBUNTU )
- VIRL_TOPOLOGY=
double-ring-nested.xenial
- VIRL_RELEASE=
csit-ubuntu-16.04.1_2017-02-20_1.7
+ VIRL_TOPOLOGY=
$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
+ VIRL_RELEASE=
$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
esac
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
esac
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
@@
-222,7
+229,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_VIRL[@]}")
+ "start-testcase -vv --copy ${VIRL_TOPOLOGY} \
+ --expiry ${VIRL_SESSION_EXPIRY} \
+ --release ${VIRL_RELEASE} ${VPP_PKGS_VIRL[@]}")
retval=$?
if [ ${retval} -ne "0" ]; then
echo "VIRL simulation start failed"
retval=$?
if [ ${retval} -ne "0" ]; then
echo "VIRL simulation start failed"
@@
-267,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
@@
-275,14
+285,15
@@
do
pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
- --suite "tests.func" \
+ --suite "tests.
vpp.
func" \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \
--noncritical EXPECTED_FAILING \
--include vm_envAND3_node_single_link_topo \
--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
@@
-340,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