Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Nested VM refresh
[csit.git]
/
bootstrap-TLDK.sh
diff --git
a/bootstrap-TLDK.sh
b/bootstrap-TLDK.sh
index
7edaa4e
..
7a26e88
100755
(executable)
--- a/
bootstrap-TLDK.sh
+++ b/
bootstrap-TLDK.sh
@@
-17,6
+17,8
@@
set -x
cat /etc/hostname
cat /etc/hosts
cat /etc/hostname
cat /etc/hosts
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
@@
-118,7
+120,7
@@
TLDK_TAR_FILE="tldk_depends.tar.gz"
wget "fast.dpdk.org/rel/${DPDK_PACKAGE}"
tar zcf ${TLDK_TAR_FILE} ${DPDK_PACKAGE} ./tldk/ \
wget "fast.dpdk.org/rel/${DPDK_PACKAGE}"
tar zcf ${TLDK_TAR_FILE} ${DPDK_PACKAGE} ./tldk/ \
- ./
TLDK-tests/tldk_testconfig/ ./TLDK-tests/tldk_deplibs
/
+ ./
tests/tldk/tldk_testconfig
/
cat ${VIRL_PKEY}
# Copy the files to VIRL host
cat ${VIRL_PKEY}
# Copy the files to VIRL host
@@
-136,7
+138,7
@@
fi
echo "Starting simulation on VIRL server"
VIRL_TOPOLOGY=double-ring-nested.xenial
echo "Starting simulation on VIRL server"
VIRL_TOPOLOGY=double-ring-nested.xenial
-VIRL_RELEASE=csit-ubuntu-16.04.1_201
6-12-19_1.6
+VIRL_RELEASE=csit-ubuntu-16.04.1_201
7-07-26_1.9
function stop_virl_simulation {
ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\
function stop_virl_simulation {
ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\
@@
-195,7
+197,17
@@
fi
PYTHONPATH=`pwd` pybot -L TRACE -W 150 \
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
PYTHONPATH=`pwd` pybot -L TRACE -W 150 \
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "
TLDK-tests
.func" \
+ --suite "
tests.tldk
.func" \
--include vm_envAND3_node_single_link_topo \
--noncritical EXPECTED_FAILING \
--include vm_envAND3_node_single_link_topo \
--noncritical EXPECTED_FAILING \
- TLDK-tests/
+ tests/
+
+RETURN_STATUS=$(echo $?)
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done
+
+exit ${RETURN_STATUS}