X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-hc2vpp-integration.sh;h=ab5fa22a1de5e7580a81faeabacb02899296e5d9;hp=eec9eef400e40796c52511d1ffac498c8494906c;hb=0bd1a1e649c66d3c1976ec07c06b3f759e78bb03;hpb=5e59e02d72a8c98b1fa54a8c863349c605ef095a diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh index eec9eef400..ab5fa22a1d 100755 --- a/bootstrap-hc2vpp-integration.sh +++ b/bootstrap-hc2vpp-integration.sh @@ -32,15 +32,12 @@ VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" STREAM=$1 OS=$2 -if [ "${OS}" == "ubuntu1404" ]; then - VIRL_TOPOLOGY=double-ring-nested.trusty - VIRL_RELEASE=csit-ubuntu-14.04.4_2016-10-07_1.3 -elif [ "${OS}" == "ubuntu1604" ]; then +if [ "${OS}" == "ubuntu1604" ]; then VIRL_TOPOLOGY=double-ring-nested.xenial - VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6 + VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-23_1.8 elif [ "${OS}" == "centos7" ]; then VIRL_TOPOLOGY=double-ring-nested.centos7 - VIRL_RELEASE=csit-centos-7.3-1611 + VIRL_RELEASE=csit-centos-7.3-1611_2017-02-23_1.4 fi SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" @@ -227,7 +224,7 @@ fi PYTHONPATH=`pwd` pybot -L TRACE -W 136\ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ --suite "tests.func" \ - --include honeycomb_sanity \ + --include HC_FUNC \ --noncritical EXPECTED_FAILING \ tests/