diff options
| author |   Jan <jgelety@cisco.com> | 2016-06-15 11:17:59 +0200 |
|---|---|---|
| committer | Jan <jgelety@cisco.com> | 2016-06-17 12:30:01 +0200 |
| commit | a4eb9283c92fcd80aaf7cf5866d4fbd20c957b65 (patch) | |
| tree | e295e4a1c28a58d6be7ab261f79d2cf092de933f /bootstrap.sh | |
| parent | c79921fc24b3e56e6b1a9e263d657ec7a8addd84 (diff) | |
Necessary changes for CSIT stable/1606 branch
- use correct URL in VPP_REPO_URL
- use correct VPP build version in VPP_STABLE_VER
- use correct release repo in download_install_vpp_pkgs.sh
Change-Id: Id378acbcf9a71f7ed62d6c422d5bf80e94b24811
Signed-off-by: Jan <jgelety@cisco.com>
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index c75f527735..09b75cd3c6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -104,14 +104,15 @@ do done # Temporarily download VPP packages from nexus.fd.io +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ "${#}" -ne "0" ]; then arr=(${@}) echo ${arr[0]} else rm -f *.deb - VPP_STABLE_VER="16.09-rc0~47-g3419d0b~b214_amd64" - VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.master.ubuntu.trusty.main/content/io/fd/vpp" + VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER) + VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL) wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}.deb" || exit wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}.deb" || exit @@ -188,11 +189,11 @@ virtualenv --system-site-packages env . env/bin/activate echo pip install -pip install -r requirements.txt +pip install -r ${SCRIPT_DIR}/requirements.txt -pykwalify -s resources/topology_schemas/3_node_topology.sch.yaml \ - -s resources/topology_schemas/topology.sch.yaml \ - -d topologies/enabled/topology.yaml \ +pykwalify -s ${SCRIPT_DIR}/resources/topology_schemas/3_node_topology.sch.yaml \ + -s ${SCRIPT_DIR}/resources/topology_schemas/topology.sch.yaml \ + -d ${SCRIPT_DIR}/topologies/enabled/topology.yaml \ -vvv result=$? @@ -202,7 +203,7 @@ if [ "${result}" -ne "0" ]; then fi PYTHONPATH=`pwd` pybot -L TRACE \ - -v TOPOLOGY_PATH:topologies/enabled/topology.yaml \ + -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ |