X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-vpp-verify-weekly.sh;h=e732810080ca64fd3f48249ee094ae4deaa91193;hp=ecd0f158e8f27f3157702ac087425d8e7021c476;hb=c3f62e968ff53a70a8503c22e9269aae44acce66;hpb=24ba1e81f527cf14cbb56bc73661e62353d4f4d9 diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index ecd0f158e8..e732810080 100644 --- 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 )" +# 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 @@ -119,7 +125,7 @@ done # 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-devel vpp-lib vpp-plugins" DPDK_ARTIFACTS="" PACKAGE="rpm" VPP_CLASSIFIER="" @@ -231,6 +237,7 @@ pip install -r ${SCRIPT_DIR}/requirements.txt RC=0 MORE_FAILS=0 +partial_logs="" 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 \ - --output log_test_set${test_set} \ + --output ${LOG_PATH}/output_test_set${test_set} \ 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 @@ -290,11 +298,10 @@ echo Post-processing test data... # 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 -rm -f ./log_test_set1.xml ./log_test_set2.xml ./log_test_set3.xml +rm -f ${partial_logs} echo Post-processing finished.