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: tables
[csit.git]
/
bootstrap-vpp-verify-semiweekly.sh
diff --git
a/bootstrap-vpp-verify-semiweekly.sh
b/bootstrap-vpp-verify-semiweekly.sh
index
14453e3
..
af56e9f
100644
(file)
--- a/
bootstrap-vpp-verify-semiweekly.sh
+++ b/
bootstrap-vpp-verify-semiweekly.sh
@@
-45,7
+45,7
@@
OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\
if [ "$OS_ID" == "centos" ]; then
DISTRO="CENTOS"
PACKAGE="rpm"
if [ "$OS_ID" == "centos" ]; then
DISTRO="CENTOS"
PACKAGE="rpm"
- sudo yum install -y python-devel python-virtualenv
+ sudo yum install -y python-devel python-virtualenv
openssh-clients sshpass
elif [ "$OS_ID" == "ubuntu" ]; then
DISTRO="UBUNTU"
PACKAGE="deb"
elif [ "$OS_ID" == "ubuntu" ]; then
DISTRO="UBUNTU"
PACKAGE="deb"
@@
-65,12
+65,15
@@
if [ "${#}" -ne "0" ]; then
echo ${arr[0]}
else
# Download the latest VPP build install packages
echo ${arr[0]}
else
# Download the latest VPP build install packages
- bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \
- --skip-install
+ CSIT_DIR=${SCRIPT_DIR}
+ source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
+ download_artifacts
+ # Need to revert -euo as the rest of script is not optimized for this.
+ set +euo pipefail
fi
VIRL_DIR_LOC="/tmp/"
fi
VIRL_DIR_LOC="/tmp/"
-VPP_PKGS=(vpp*.$PACKAGE)
+VPP_PKGS=(
*
vpp*.$PACKAGE)
VPP_PKGS_FULL=("${VPP_PKGS[@]/#/${VIRL_DIR_LOC}}")
echo ${VPP_PKGS[@]}
VPP_PKGS_FULL=("${VPP_PKGS[@]/#/${VIRL_DIR_LOC}}")
echo ${VPP_PKGS[@]}
@@
-258,7
+261,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.
partial_logs=""
# 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
+for test_set in 1 2
do
echo
echo Functional test loop: ${test_set}
do
echo
echo Functional test loop: ${test_set}
@@
-270,6
+273,8
@@
do
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \
+ --exclude SOFTWIRE \
+ --exclude SKIP_TEST \
--noncritical EXPECTED_FAILING \
--output ${LOG_PATH}/output_func_test_set${test_set} \
tests/
--noncritical EXPECTED_FAILING \
--output ${LOG_PATH}/output_func_test_set${test_set} \
tests/