Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: Perpatch PY3
[csit.git]
/
bootstrap.sh
diff --git
a/bootstrap.sh
b/bootstrap.sh
index
02aa713
..
91ddb97
100755
(executable)
--- a/
bootstrap.sh
+++ b/
bootstrap.sh
@@
-26,13
+26,15
@@
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
+ # TODO: Remove when corresponding part of CSIT-1546 is addressed.
+ 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"
+ # TODO: Remove when corresponding part of CSIT-1546 is addressed.
export DEBIAN_FRONTEND=noninteractive
sudo apt-get -y update
export DEBIAN_FRONTEND=noninteractive
sudo apt-get -y update
- sudo apt-get -y install libpython2.7-dev python-virtualenv
+ sudo apt-get -y install libpython2.7-dev python-virtualenv
sshpass
else
echo "$OS_ID is not yet supported."
exit 1
else
echo "$OS_ID is not yet supported."
exit 1
@@
-44,14
+46,16
@@
if [ "${#}" -ne "0" ]; then
echo ${arr[0]}
SKIP_PATCH="skip_patchORskip_vpp_patch"
else
echo ${arr[0]}
SKIP_PATCH="skip_patchORskip_vpp_patch"
else
- DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER)
- VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO})
- bash ${SCRIPT_DIR}/resources/tools/scripts/download_install_vpp_pkgs.sh \
- --skip-install --vpp ${VPP_STABLE_VER} --dkms ${DPDK_STABLE_VER}
+ VPP_VERSION=$(< ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO})
+ 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[@]}
@@
-99,7
+103,7
@@
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
-TEST_GROUPS=("
crypto,ip4_tunnels.softwire,ip4_tunnels.vxlan" "ip4,ip4_tunnels.gre,ip4_tunnels.lisp,ip6_tunnels.vxlan,ip6_tunnels.lisp,vm_vhost.ip4,vm_vhost.ip6" "interfaces,ip6,l2bd,l2xc,vm_vhost.l2bd,vm_vhost.l2xc,telemetry
")
+TEST_GROUPS=("
ip4_tunnels,ip6_tunnels,l2xc
")
SUITE_PATH="tests.vpp.func"
SKIP_PATCH="SKIP_PATCH"
SUITE_PATH="tests.vpp.func"
SKIP_PATCH="SKIP_PATCH"
@@
-247,6
+251,7
@@
for index in "${!VIRL_SERVER[@]}"; do
"start-testcase -vv \
--quota ${IP_QUOTA} \
--copy ${VIRL_TOPOLOGY} \
"start-testcase -vv \
--quota ${IP_QUOTA} \
--copy ${VIRL_TOPOLOGY} \
+ --expiry 180 \
--release ${VIRL_RELEASE} \
${VPP_PKGS_FULL[@]}")
# TODO: remove param ${VPP_PKGS_FULL[@]} when start-testcase script is
--release ${VIRL_RELEASE} \
${VPP_PKGS_FULL[@]}")
# TODO: remove param ${VPP_PKGS_FULL[@]} when start-testcase script is
@@
-316,7
+321,9
@@
function run_test_set() {
--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_PATCH} \
--exclude ${SKIP_PATCH} \
+ --exclude SKIP_TEST \
--noncritical EXPECTED_FAILING \
--output ${LOG_PATH}/log_test_set_run${nr} \
tests/"
--noncritical EXPECTED_FAILING \
--output ${LOG_PATH}/log_test_set_run${nr} \
tests/"
@@
-327,7
+334,9
@@
function run_test_set() {
--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_PATCH} \
--exclude ${SKIP_PATCH} \
+ --exclude SKIP_TEST \
--noncritical EXPECTED_FAILING \
--output ${LOG_PATH}/log_test_set_run${nr} \
tests/
--noncritical EXPECTED_FAILING \
--output ${LOG_PATH}/log_test_set_run${nr} \
tests/