Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: use correct IF name in Vpp Route Add in case of multi-VMs config
[csit.git]
/
bootstrap-hc2vpp-integration.sh
diff --git
a/bootstrap-hc2vpp-integration.sh
b/bootstrap-hc2vpp-integration.sh
index
eec9eef
..
f7e9be4
100755
(executable)
--- a/
bootstrap-hc2vpp-integration.sh
+++ b/
bootstrap-hc2vpp-integration.sh
@@
-29,18
+29,17
@@
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log)
+
STREAM=$1
OS=$2
STREAM=$1
OS=$2
-if [ "${OS}" == "ubuntu1404" ]; then
- VIRL_TOPOLOGY=double-ring-nested.trusty
- VIRL_RELEASE=csit-ubuntu-14.04.4_2016-10-07_1.3
-elif [ "${OS}" == "ubuntu1604" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
VIRL_TOPOLOGY=double-ring-nested.xenial
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-02-23_1.8
elif [ "${OS}" == "centos7" ]; then
VIRL_TOPOLOGY=double-ring-nested.centos7
elif [ "${OS}" == "centos7" ]; then
VIRL_TOPOLOGY=double-ring-nested.centos7
- VIRL_RELEASE=csit-centos-7.3-1611
+ VIRL_RELEASE=csit-centos-7.3-1611
_2017-02-23_1.4
fi
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
fi
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
@@
-121,7
+120,7
@@
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# Download VPP and HC packages from the current branch
echo Downloading packages...
# Download VPP and HC packages from the current branch
echo Downloading packages...
-bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh ${STREAM} ${OS}
+bash ${SCRIPT_DIR}/resources/tools/
scripts/
download_hc_pkgs.sh ${STREAM} ${OS}
if [ "${OS}" == "centos7" ]; then
VPP_PKGS=(*.rpm)
if [ "${OS}" == "centos7" ]; then
VPP_PKGS=(*.rpm)
@@
-226,11
+225,21
@@
fi
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "tests.func" \
- --include
honeycomb_sanity
\
+ --suite "tests.
vpp.
func" \
+ --include
HC_FUNC
\
--noncritical EXPECTED_FAILING \
tests/
--noncritical EXPECTED_FAILING \
tests/
+RETURN_STATUS=$?
+
# Get Honeycomb log file from virl host
scp ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true
# Get Honeycomb log file from virl host
scp ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done
+
+exit ${RETURN_STATUS}