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
989f786
..
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
@@
-101,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=("ip4_tunnels,ip6
,ip6_tunnels,l2bd" "ip4,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"