X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap.sh;h=189ec6f3cc4ac24a1eaabe915d2e4d524a9ecf39;hp=e3d80e7d56460308c586fe7fa8c1d41a78970790;hb=02f01f9f327cc64745c1941968813b3f107ca771;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b diff --git a/bootstrap.sh b/bootstrap.sh index e3d80e7d56..189ec6f3cc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,7 +23,7 @@ export PYTHONPATH=${SCRIPT_DIR} if [ -f "/etc/redhat-release" ]; then DISTRO="CENTOS" sudo yum install -y python-devel python-virtualenv - VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins" + VPP_ARTIFACTS="vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins" DPDK_ARTIFACTS="" PACKAGE="rpm" VPP_CLASSIFIER="" @@ -52,8 +52,8 @@ fi VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") IPS_PER_VIRL=( "10.30.51.28:252" - "10.30.51.29:74" - "10.30.51.30:74" ) + "10.30.51.29:252" + "10.30.51.30:252" ) SIMS_PER_VIRL=( "10.30.51.28:13" "10.30.51.29:13" "10.30.51.30:13" ) @@ -92,7 +92,7 @@ VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" 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,telemetry" "ip4,ip4_tunnels.gre,ip4_tunnels.lisp,ip6_tunnels.vxlan,vm_vhost.ip4,vm_vhost.ip6" "interfaces,ip6,ip6_tunnels.lisp,l2bd,l2xc,vm_vhost.l2bd,vm_vhost.l2xc") +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") SUITE_PATH="tests.vpp.func" SKIP_PATCH="SKIP_PATCH" @@ -195,10 +195,6 @@ if [ "${#}" -ne "0" ]; then arr=(${@}) echo ${arr[0]} SKIP_PATCH="skip_patchORskip_vpp_patch" - # Download DPDK parts not included in dpdk plugin of vpp build - for ARTIFACT in ${DPDK_ARTIFACTS}; do - wget -q "${VPP_REPO_URL}/${ARTIFACT}/${DPDK_STABLE_VER}/${ARTIFACT}-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.${PACKAGE}" || exit - done else rm -f *.${PACKAGE} for ARTIFACT in ${DPDK_ARTIFACTS}; do