X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-hc2vpp-integration.sh;h=21b4ae7607cc00a2b63056c82927765e2b79f7b8;hp=e8c0d5e9189c1fd84a8318d7d1f88158bfe58254;hb=45a2a4b8ce0b75d912d5892d9840c66f160d3775;hpb=4df00930b5a2cf67f32682f44e0540819b9575af diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh index e8c0d5e918..21b4ae7607 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" @@ -150,8 +147,13 @@ for index in "${!VIRL_SERVER[@]}"; do if [ "${copy}" -eq "0" ]; then echo "files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}" else - scp ${SSH_OPTIONS} *.deb *.rpm \ - ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ + if [ "${OS}" == "centos7" ]; then + scp ${SSH_OPTIONS} *.rpm \ + ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ + else + scp ${SSH_OPTIONS} *.deb \ + ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ + fi result=$? if [ "${result}" -ne "0" ]; then echo "Failed to copy files to VIRL host ${VIRL_SERVER[${index}]}"