diff options
| author |   Fangyin Hu <fangyinx.hu@intel.com> | 2017-06-20 01:01:47 -0700 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2017-06-20 08:04:36 +0000 |
| commit | 55e8f8d168aaa43751cb4d24f40d2eb0b9c89d25 (patch) | |
| tree | 6624e7dd5d3ac3fc3f0d3808cb0228fc4672fc3b | |
| parent | 086f3a5065d744e00fe10289eb2f090b7bde208e (diff) | |
Change the bootstrap and download NSH SFC packages.
Change-Id: I0ce00433b995a8cac78b059ba1f26cc07554e158
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>
| -rwxr-xr-x | bootstrap-nsh_sfc-functional-virl.sh | 9 | ||||
| -rwxr-xr-x | resources/tools/download_nsh_sfc_pkgs.sh | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/bootstrap-nsh_sfc-functional-virl.sh b/bootstrap-nsh_sfc-functional-virl.sh index 70a68c01f1..35754bb143 100755 --- a/bootstrap-nsh_sfc-functional-virl.sh +++ b/bootstrap-nsh_sfc-functional-virl.sh @@ -21,6 +21,12 @@ 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="" @@ -29,8 +35,7 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" -STREAM=$1 -OS=$2 +STREAM="master" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PYTHONPATH=${SCRIPT_DIR} diff --git a/resources/tools/download_nsh_sfc_pkgs.sh b/resources/tools/download_nsh_sfc_pkgs.sh index cd007732e6..2261f084e5 100755 --- a/resources/tools/download_nsh_sfc_pkgs.sh +++ b/resources/tools/download_nsh_sfc_pkgs.sh @@ -25,7 +25,7 @@ URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="RELEASE" GROUP="io.fd.vpp" NSH_GROUP="io.fd.nsh_sfc" -VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java" +VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java vpp-api-python vpp-api-lua" NSH_ARTIFACTS="vpp-nsh-plugin" if [ "${OS}" == "ubuntu1404" ]; then |