- add VPP_REPO_URL file to store path to VPP build repository
- add VPP_STABLE_VER file to store VPP stable build version
- adapt bootstrap*.sh files to read VPP build repository path
and VPP stable build version from files
Change-Id: I2997320ec3df68eaf092795e5d553fb3f024d366
Signed-off-by: Jan Gelety <jgelety@cisco.com>
--- /dev/null
+https://nexus.fd.io/service/local/repositories/fd.io.master.ubuntu.trusty.main/content/io/fd/vpp
--- /dev/null
+16.09-rc0~65-g30097b5~b232_amd64
chmod 600 priv_key
# Temporarily download VPP packages from nexus.fd.io
chmod 600 priv_key
# Temporarily download VPP packages from nexus.fd.io
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
rm -f *.deb
if [ "${#}" -ne "0" ]; then
arr=(${@})
echo ${arr[0]}
else
rm -f *.deb
if [ "${#}" -ne "0" ]; then
arr=(${@})
echo ${arr[0]}
else
- 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_MASTER_STABLE_VER)
+ VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_MASTER_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
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
echo
echo ${test_set}. test loop
PYTHONPATH=`pwd` pybot -L TRACE \
echo
echo ${test_set}. test loop
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 \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \
done
# Temporarily download VPP packages from nexus.fd.io
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
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_MASTER_STABLE_VER)
+ VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_MASTER_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
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
echo pip install
pip install -r requirements.txt
echo pip install
pip install -r 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 \
fi
PYTHONPATH=`pwd` pybot -L TRACE \
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 \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \