From 890c00d6b809d0d908903fbf1a0ec5ceca8b54ad Mon Sep 17 00:00:00 2001 From: selias Date: Fri, 22 Sep 2017 10:49:28 +0200 Subject: Update disk-image-builder scripts to allow IPv6 Change-Id: I28ed08689db97eabc21726afa9d977fcda526dfb Signed-off-by: selias --- bootstrap-hc2vpp-integration.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'bootstrap-hc2vpp-integration.sh') diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh index f7e9be44fd..790465541e 100755 --- a/bootstrap-hc2vpp-integration.sh +++ b/bootstrap-hc2vpp-integration.sh @@ -17,9 +17,7 @@ set -x cat /etc/hostname cat /etc/hosts -export DEBIAN_FRONTEND=noninteractive -sudo apt-get -y update -sudo apt-get -y install libpython2.7-dev python-virtualenv +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") VIRL_SERVER="" @@ -34,12 +32,18 @@ ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) STREAM=$1 OS=$2 -if [ "${OS}" == "ubuntu1604" ]; then - VIRL_TOPOLOGY=double-ring-nested.xenial - 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_2017-02-23_1.4 +if [ -f "/etc/redhat-release" ]; then + DISTRO="CENTOS" + sudo yum install -y python-devel python-virtualenv + VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS) + VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS) +else + DISTRO="UBUNTU" + export DEBIAN_FRONTEND=noninteractive + sudo apt-get -y update + sudo apt-get -y install libpython2.7-dev python-virtualenv + VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU) + VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU) fi SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" -- cgit 1.2.3-korg