diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2019-02-14 10:23:17 +0100 |
|---|---|---|
| committer | Jan Gelety <jgelety@cisco.com> | 2019-02-14 10:23:17 +0100 |
| commit | 3024e96e7f3c654bccd31e94c0a30b66e2b075e3 (patch) | |
| tree | 2a7f382667cf0ab247871cd5a5544d5e4bc603a3 | |
| parent | 71ae99472d3e38a3110db2f3930ecba39d5fde18 (diff) | |
FIX: nsh - use correct stream inside csit rls branch
Change-Id: Ief169f19565702a8a3eb5c0292dbc82cf7c4d231
Signed-off-by: Jan Gelety <jgelety@cisco.com>
| -rwxr-xr-x | bootstrap-nsh_sfc-functional-virl.sh | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/bootstrap-nsh_sfc-functional-virl.sh b/bootstrap-nsh_sfc-functional-virl.sh index 034ea9bfd4..12c77ae303 100755 --- a/bootstrap-nsh_sfc-functional-virl.sh +++ b/bootstrap-nsh_sfc-functional-virl.sh @@ -19,16 +19,6 @@ cat /etc/hosts ARCHIVE_ARTIFACTS=(log.html output.xml report.html) -export DEBIAN_FRONTEND=noninteractive -sudo apt-get -y update -sudo apt-get -y install libpython2.7-dev python-virtualenv - -if [ -f "/etc/redhat-release" ]; then - OS="centos7" -else - OS="ubuntu1604" -fi - VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") VIRL_SERVER="" @@ -37,15 +27,20 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" -STREAM="master" +STREAM=$1 +OS=$2 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PYTHONPATH=${SCRIPT_DIR} if [ "${OS}" == "ubuntu1604" ]; then + 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) elif [ "${OS}" == "centos7" ]; then + 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 |